Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Changeset 2482

Show
Ignore:
Timestamp:
10/19/07 19:57:30 (1 year ago)
Author:
bmckown
Message:

Form2Program Module - Fixed bug where an update was not set as 'applied' when no existing patients needed enrolled.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs-modules/form2program

    • Property svn:ignore set to
      dist

  • openmrs-modules/form2program/metadata/messages.properties

    r2352 r2482  
    1010form2program.error.alreadyExists=Encounter Type already enrolls to this Program 
    1111form2program.error.notExists=Encounter Type does not enroll to this Program 
    12 form2program.needUpdate=Patients with this encounter type need to be enrolled.  Please 'Update' the database. 
     12form2program.needUpdate=Click 'Update' to enroll existing patients that have previously used this encounter type. 
    1313form2program.delete.confirm=Delete Encounter Type from Program? 
    1414form2program.update.confirm=Update Program enrollment? This might take some time. 
     15form2program.update.success=Existing patients were successfully enrolled in the program. 
     16form2program.update.none=No existing patients needed to be enrolled in this program. 

  • openmrs-modules/form2program/src/org/openmrs/module/form2program/db/hibernate/HibernateForm2ProgramDAO.java

    r2352 r2482  
    139139                try { 
    140140                        rows = this.sessionFactory.getCurrentSession().connection().prepareStatement(query).executeUpdate(); 
    141                         if (rows > 0) { 
    142                                 String applied = "UPDATE form2program_map set applied = true where program = " + program.getProgramId().toString(); 
    143                                 this.sessionFactory.getCurrentSession().connection().prepareStatement(applied).executeUpdate(); 
    144                         } 
     141                        String applied = "UPDATE form2program_map set applied = true where program = " + program.getProgramId().toString(); 
     142                        this.sessionFactory.getCurrentSession().connection().prepareStatement(applied).executeUpdate(); 
    145143                } 
    146144                catch (Exception e){ 
    …… 
    167165        try { 
    168166                rows = this.sessionFactory.getCurrentSession().connection().prepareStatement(query).executeUpdate(); 
    169                 if (rows > 0) { 
    170                         String applied = "UPDATE form2program_map set applied = true where program = " + program.getProgramId().toString(); 
    171                         this.sessionFactory.getCurrentSession().connection().prepareStatement(applied).executeUpdate(); 
    172                 } 
     167                String applied = "UPDATE form2program_map set applied = true where program = " + program.getProgramId().toString(); 
     168                this.sessionFactory.getCurrentSession().connection().prepareStatement(applied).executeUpdate(); 
    173169        } 
    174170        catch (Exception e){ 

  • openmrs-modules/form2program/web/src/org/openmrs/module/form2program/web/controller/Form2ProgramFormController.java

    r2352 r2482  
    8989                        Integer programId = Integer.valueOf(selectedProgram); 
    9090                        program = getProgramWorkflowService().getProgram(programId); 
    91                         form2ProgramService.applyForm2ProgramMap(program, creator, today); 
     91                        if (form2ProgramService.applyForm2ProgramMap(program, creator, today) > 0) { 
     92                                httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "form2program.update.success"); 
     93                        } 
     94                        else { 
     95                                httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "form2program.update.none");                             
     96                        } 
    9297                } 
    9398                else if (null != delete) {