csr payload preview

cpims/settings.py

@@ -106,13 +106,8 @@
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'cpims_gok',
-<<<<<<< HEAD
-        'USER': 'postgres',
-        'PASSWORD': 'test',
-=======
         'USER': 'cpimsdbuser',
         'PASSWORD': 'Xaen!ee8',
->>>>>>> mobile_approval
         'HOST': '127.0.0.1',
         'PORT': '5432', }
 }
@@ -242,8 +237,8 @@
 DOC_ROOT = os.path.join(BASE_DIR, 'static')
 
 SIMPLE_JWT = {
-    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=5),
-    'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
+    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=30),
+    'REFRESH_TOKEN_LIFETIME': timedelta(days=10),
     'UPDATE_LAST_LOGIN': True,
 }
 

cpovc_mobile/urls.py

@@ -20,11 +20,12 @@
     path('notifications/', views.MobileNotifications.as_view()),
     # Approval urls UI
     path("mobile-approval/", views.mobile_app_home, name="mobile_app_home"),
-    re_path(
-        r"^crs/view/(?P<id>[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12})/$",
-        views.view_mobile_case_record_sheet,
-        name="view_mobile_case_record_sheet",
-    ),
+    path("crs/view/<uuid:id>/", views.view_mobile_case_record_sheet, name="view_mobile_case_record_sheet"),
+    # re_path(
+    #     r"^crs/view/(?P<id>[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12})/$",
+    #     views.view_mobile_case_record_sheet,
+    #     name="view_mobile_case_record_sheet",
+    # ),
 #      re_path(
 #         r"^crs/view/(?P<id>\w+)/$",
 #         views.view_mobile_case_record_sheet,

cpovc_stat_inst/parameters.py

@@ -140,11 +140,7 @@
 FPERM['FMSI037F'] = {0: [''], 1: ['CRU'], 2: ['CRU'], 3: ['RUD']}
 FPERM['FMSI038F'] = {0: [''], 1: ['CRU'], 2: ['CRU'], 3: ['RUD']}
 
-<<<<<<< HEAD
-INSTM={}
-=======
 
 # missing
 INSTM = {}
 INSTM[''] = ['']
->>>>>>> mobile_approval

templates/mobile/home.html

@@ -71,10 +71,8 @@ <h4 class="panel-title">Mobile Approval - Workflow</h4>
               <th>Action</th>
             </tr>
           </thead>
-          <tbody>
-
-          </tbody>
-           {% comment %} {% for case in cases %}
+          <tbody></tbody>
+          {% comment %} {% for case in cases %}
           <tr>
             <td>{{ forloop.counter }}</td>
             <td>{{ case.id }}</td>
@@ -109,7 +107,7 @@ <h4 class="panel-title">Mobile Approval - Workflow</h4>
               {% endif %}
             </td>
           </tr>
-          {% endfor %}  {% endcomment %}
+          {% endfor %} {% endcomment %}
         </table>
       </div>
       <!-- end panel body -->
@@ -127,81 +125,105 @@ <h4 class="panel-title">Mobile Approval - Workflow</h4>
 <script src="{% static 'plugins/datatables/js/datetime-moment.js' %}"></script>
 
 <script>
-    $(document).ready(function () {
-      var table = $('#data-table').DataTable({
-        columns: [
-            {data: "case_id"},
-            {data: "case_serial"},
-            {data: "risk_level"},
-            {data: "perpetrator_status"},
-            {data: "case_status"},
-            {data: "case_reporter"},
-            {data: "case_remarks"},
-            {data: "ovc_cpims_id"},
-            {data: "ovc_first_name"},
-            {data: "ovc_other_names"},
-            {data: "ovc_sex"},
-            {data: "siblings"},
-            {data: "sibling_date_linked"},
-            {data: "sibling_date_delinked"}
-        ]
-      });
+  $(document).ready(function () {
+    var table = $('#data-table').DataTable({
+      columns: [
+        { data: 'index' },
+        { data: 'origin' },
+        { data: 'cunty' },
+        { data: 'constituency' },
+        { data: 'case_reporter' },
+        { data: 'telephone' },
+        { data: 'case_category' },
+        { data: 'child_name' },
+        { data: 'child_sex' },
+        { data: 'child_dob' },
+        { data: 'case_date' },
+        { data: 'timestamp' },
+        { data: 'status' },
+        { data: 'actions' },
+      ],
+    });
 
+    apiCall('crs', 'GET')
+      .then((initial_data) => {
+        let initialData = initial_data['results']
+        let initialData_len = initialData.length
+        let caseParams = {}
+        console.log({ initialData, initialData_len }); // Logging row_data for debugging
+        if (initialData_len > 0) {
+          let indx = 0;
+          const row_data = initialData.map((val) => {
+            let case_params_string = val.case_params
 
-    apiCall('caseload', "GET")
-    .then(initial_data => {
-      console.log({ initial_data, table });
-      let indx = 0;
-      const row_data = initial_data.map(val => {
-        indx++
-        return {
-          "case_id": indx,
-          "case_serial": val.case_serial,
-          "risk_level": val.risk_level,
-          "perpetrator_status": val.perpetrator_status,
-          "case_status": val.case_status,
-          "case_reporter": val.case_reporter,
-          "case_remarks": val.case_remarks,
-          "ovc_cpims_id": val.ovc_cpims_id,
-          "ovc_first_name": val.ovc_first_name,
-          "ovc_other_names": val.ovc_other_names,
-          "ovc_sex": val.ovc_sex,
-          "siblings": val.case_id,
-          "sibling_date_linked": "Hello",
-          "sibling_date_delinked": htmlAction(val.case_id)
-        };
+            console.log({case_params_string, caseParams} )
+            childName = caseParams.child_first_name // + " " + caseParams.child_surname
+            indx++;
+            return {
+              index: indx,
+              origin: val.case_reporter,
+              cunty: val.county,
+              constituency: val.constituency,
+              case_reporter: val.case_reporter,
+              telephone: val.reporter_telephone,
+              case_category: val.case_record_id,
+              child_name: childName,
+              child_sex: caseParams.child_sex == 'SMAL' ? "Male" : "Female",
+              child_dob: caseParams.child_dob,
+              case_date: val.case_date,
+              timestamp: val.timestamp_created,
+              status: val.status,
+              actions: htmlAction(val.case_id),
+            };
+          });
+          table.rows.add(row_data).draw();
+        } else {
+          table.row
+            .add({
+              index: '',
+              origin: '',
+              cunty: '',
+              constituency: '',
+              case_reporter: '',
+              telephone: '',
+              case_category: 'No Data',
+              child_name: '',
+              child_sex: '',
+              child_dob: '',
+              case_date: '',
+              timestamp: '',
+              status: '',
+              actions: '',
+            })
+            .draw();
+        }
+      })
+      .catch((error) => {
+        console.error('Error fetching initial data:', error);
       });
-
-      console.log({ row_data }); // Logging row_data for debugging
-
-      table.rows.add(row_data).draw();
-    })
-    .catch(error => {
-      console.error('Error fetching initial data:', error);
-    }); 
-
   });
 
-
-    const apiCall = async (url, pMethod) => {
-      var settings = {
-        url: window.location.origin + '/api/mobile/' + url,
-        method: pMethod,
-        timeout: 0,
-        headers: {},
-      };
-      return $.ajax(settings).done(function (response) {
-        return response;
-      });
+  const apiCall = async (url, pMethod) => {
+    var settings = {
+      url: window.location.origin + '/api/mobile/' + url,
+      method: pMethod,
+      timeout: 0,
+      headers: {},
     };
+    return $.ajax(settings).done(function (response) {
+      let responseData = response
+      {% comment %} debugger; {% endcomment %}
+      return responseData ? responseData : false;
+    });
+  };
 
-    // Get the Button for view user
-    const htmlAction = (caseId) => {
-      return `<a
+  // Get the Button for view user
+  const htmlAction = (caseId) => {
+    return `<a
                 href="/api/mobile/crs/view/${caseId}/"
                 class="btn btn-sm btn-primary m-r-5"
                 >View Case details</a
-              >`
-    }
+              >`;
+  };
 </script>
 {% endblock %}