Changes between Version 6 and Version 7 of Ticket #851, comment 3


Ignore:
Timestamp:
Feb 18, 2016, 9:10:56 AM (8 years ago)
Author:
olle

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #851, comment 3

    v6 v7  
    1111 1. JSP file `retraction_followup_form.jsp` in `resources/personal/` updated with new "N/A" check boxes on each line with date sets. Also, a tag for a new status line at the end of the form is defined.
    1212 2. Javascript file `retraction_followup_form.js` in `resources/personal/` updated:[[BR]]a. Function `initPage()` updated by defining event handler functions for the five new N/A check boxes for date sets.[[BR]]b. Function `caseInfoLoaded(response)` updated to set initial status of the five new N/A check boxes to the stored states for the patient. The check box event handler functions are called to update the over-all status.[[BR]]c. New event handler functions `labDateNaOnChange()`, `bloodDateNaOnChange()`, `frozenDateNaOnChange()`, `forwardedDateNaOnChange()`, and `rccSydDateNaOnChange()`, added to handle N/A check box events for laboratory samples, blood samples, frozen samples, samples in other projects, and retraction of data sent to RCC Syd, respectively. If a N/A check box is checked, the corresponding date input fields are reset and disabled, and the date values marked as valid. At the end, new function `currentRetractionStatus()` is called to update the status line at the end of the form.[[BR]]d. Date input field event handler functions `labDateOnChange()`, `bloodDateOnChange()`, `frozenDateOnChange()`, `forwardedDateOnChange()`, and `rccSydDateOnChange()`, updated at the end to call new function `currentRetractionStatus()` to update the status line at the end of the form.[[BR]]e. New function `currentRetractionStatus()` added. It updates the status line at the end of the form.[[BR]]f. Function `validateStep2(event)` updated to call new N/A check box event handler functions before checking if all date values are valid.[[BR]]g. Function `submit()` updated by including the N/A check box statuses in the JSONObject sent to `RetractionServlet`.
    13  3. Java data access object class/file `Annotationtype.java` in `src/net/sf/basedb/reggie/dao/` updated with five new boolean annotation types for N/A check box status for the date sets. The annotations are for biosource items, as the other annotations for the retraction follow-up step.
     13 3. Java data access object class/file `Annotationtype.java` in `src/net/sf/basedb/reggie/dao/` updated with five new boolean annotation types for N/A check box status for the date sets. The annotations are for biosource items, like the other annotations for the retraction follow-up step.
    1414 4. Java servlet class/file `InstallServlet.java` in `src/net/sf/basedb/reggie/servlet/` updated in protected method `void doGet(HttpServletRequest req, HttpServletResponse resp)` to include the new annotation types for status of the N/A check boxes, and add them to `Subtype.RETRACT` and `Subtype.RETRO_NO` annotation type categories.
    1515 5. Java servlet class/file `RetractionServlet.java` in `src/net/sf/basedb/reggie/servlet/` updated:[[BR]]a. Private method `void loadPatientInfo(DbControl dc, Patient patient)` updated to load values of new annotations for status of "N/A" check boxes for retraction follow-up date sets.[[BR]]b. Protected method `void doPost(HttpServletRequest req, HttpServletResponse resp)` updated for command "`RegisterFollowUp`" to get new values of "N/A" check boxes for retraction follow-up date sets from the submitted JSONObject, and old values for the same variables from stored annotations. The annotations are then updated with the new values, and dates in date sets marked as "N/A" are ignored, when determining if patient/case data is ready for destruction. Changes of stored status values for "N/A" check boxes are also taken into account, when reporting the number of modified annotations.