Merge branch 'develop' into feature/make-form-header-sticky

app/App.js

@@ -17,6 +17,7 @@ import backgroundTask, {
   defineSyncFormVersionTask,
 } from './src/lib/background-task';
 import crudJobs, { jobStatus, MAX_ATTEMPT } from './src/database/crud/crud-jobs';
+import { ToastAndroid } from 'react-native';
 
 export const setNotificationHandler = () =>
   Notifications.setNotificationHandler({
@@ -135,18 +136,18 @@ const App = () => {
   };
 
   const handleInitDB = useCallback(async () => {
-    await conn.reset();
-    const db = conn.init;
-    const queries = tables.map((t) => {
-      const queryString = query.initialQuery(t.name, t.fields);
-      return conn.tx(db, queryString);
-    });
     try {
+      await conn.reset();
+      const db = conn.init;
+      const queries = tables.map((t) => {
+        const queryString = query.initialQuery(t.name, t.fields);
+        return conn.tx(db, queryString);
+      });
       await Promise.all(queries);
       await handleInitConfig();
       handleCheckSession();
     } catch (error) {
-      console.error('[INITIAL DB]', error);
+      ToastAndroid.show(`[INITIAL DB]: ${error}`, ToastAndroid.LONG);
     }
   }, [handleInitConfig, handleCheckSession]);
 

app/src/database/conn.js

@@ -87,7 +87,7 @@ const removeDB = async () => {
       }
     }
   } catch (error) {
-    console.error('[RESET DB]', error);
+    return Promise.reject(error);
   }
 };
 

app/src/database/crud/crud-config.js

@@ -7,11 +7,13 @@ const configQuery = () => {
   const id = 1;
   return {
     getConfig: async () => {
-      const { rows } = await conn.tx(db, query.read('config', { id }), [id]);
-      if (!rows.length) {
-        return false;
-      }
-      return rows._array[rows.length - 1];
+      try {
+        const { rows } = await conn.tx(db, query.read('config', { id }), [id]);
+        if (!rows.length) {
+          return false;
+        }
+        return rows._array[rows.length - 1];
+      } catch {}
     },
     addConfig: async (data = {}) => {
       const insertQuery = query.insert('config', {

app/src/lib/background-task.js

@@ -73,15 +73,15 @@ const registerBackgroundTask = async (TASK_NAME, settingsValue = null) => {
       startOnBoot: true, // android only
     });
   } catch (err) {
-    console.error('Task Register failed:', err);
+    return Promise.reject(err);
   }
 };
 
 const unregisterBackgroundTask = async (TASK_NAME) => {
   try {
     await BackgroundFetch.unregisterTaskAsync(TASK_NAME);
   } catch (err) {
-    console.error('Task Unregister failed:', err);
+    return Promise.reject(err);
   }
 };
 
@@ -215,15 +215,16 @@ const syncFormSubmission = async (activeJob = {}) => {
       await crudJobs.deleteJob(activeJob.id);
     }
     return res;
-  } catch (err) {
+  } catch (error) {
+    const { status: errorCode } = error?.response;
     if (activeJob?.id) {
       const updatePayload =
         activeJob.attempt < MAX_ATTEMPT
           ? { status: jobStatus.FAILED, attempt: activeJob.attempt + 1 }
           : { status: jobStatus.ON_PROGRESS, info: String(err) };
       crudJobs.updateJob(activeJob.id, updatePayload);
     }
-    console.error('[syncFormSubmission] Error: ', err);
+    return Promise.reject({ errorCode, message: error?.message });
   }
 };
 

app/src/pages/AuthForm.js

@@ -95,43 +95,38 @@ const AuthForm = ({ navigation }) => {
     api
       .post('/auth', { code: passcode })
       .then(async (res) => {
-        try {
-          const { data } = res;
-          // save session
-          const bearerToken = data.syncToken;
-          api.setToken(bearerToken);
-
-          await crudConfig.updateConfig({ authenticationCode: passcode });
-          await cascades.createSqliteDir();
-          // update auth state
-          AuthState.update((s) => {
-            s.authenticationCode = passcode;
-            s.token = bearerToken;
-          });
-
-          const userID = await handleActiveUser({
-            ...data,
-            passcode,
-            administrationList: JSON.stringify(data.administrations),
-          });
-
-          await handleGetAllForms(data.formsUrl, userID);
-
-          // go to home page (form list)
-          setTimeout(() => {
-            navigation.navigate('Home', { newForms: true });
-          }, 500);
-        } catch (err) {
-          console.error(err);
-        }
+        const { data } = res;
+        // save session
+        const bearerToken = data.syncToken;
+        api.setToken(bearerToken);
+
+        await crudConfig.updateConfig({ authenticationCode: passcode });
+        await cascades.createSqliteDir();
+        // update auth state
+        AuthState.update((s) => {
+          s.authenticationCode = passcode;
+          s.token = bearerToken;
+        });
+
+        const userID = await handleActiveUser({
+          ...data,
+          passcode,
+          administrationList: JSON.stringify(data.administrations),
+        });
+
+        await handleGetAllForms(data.formsUrl, userID);
+
+        // go to home page (form list)
+        setTimeout(() => {
+          navigation.navigate('Home', { newForms: true });
+        }, 500);
       })
       .catch((err) => {
-        const { status: errStatus, message: errMessage } = err?.response;
-        if ([400, 401].includes(errStatus)) {
-          setError(trans.authErrorPasscode);
+        const { status: errorCode } = err?.response;
+        if ([400, 401].includes(errorCode)) {
+          setError(`${errorCode}: ${trans.authErrorPasscode}`);
         } else {
-          console.log('errStatus', err?.message);
-          setError(errMessage);
+          setError(`${errorCode}: ${err?.message}`);
         }
       })
       .finally(() => setLoading(false));

app/src/pages/FormData.js

@@ -163,8 +163,10 @@ const FormDataPage = ({ navigation, route }) => {
       } else {
         await runSyncSubmision();
       }
-    } catch (e) {
-      console.error('[Manual SyncFormSubmission]: ', e);
+    } catch (error) {
+      setData(data);
+      setSyncing(false);
+      ToastAndroid.show(`${error?.errorCode}: ${error?.message}`, ToastAndroid.LONG);
     }
   };
 

app/src/pages/FormPage.js

@@ -120,10 +120,9 @@ const FormPage = ({ navigation, route }) => {
       }
       refreshForm();
       navigation.navigate('Home', { ...route?.params });
-    } catch (err) {
-      console.error(err);
+    } catch (error) {
       if (Platform.OS === 'android') {
-        ToastAndroid.show(trans.errorSaveDatapoint, ToastAndroid.LONG);
+        ToastAndroid.show(`SQL: ${error}`, ToastAndroid.LONG);
       }
     }
   };
@@ -192,10 +191,9 @@ const FormPage = ({ navigation, route }) => {
       }
       refreshForm();
       navigation.navigate('Home', { ...route?.params });
-    } catch (err) {
-      console.error(err);
+    } catch (error) {
       if (Platform.OS === 'android') {
-        ToastAndroid.show(trans.errorSubmitted, ToastAndroid.LONG);
+        ToastAndroid.show(`SQL: ${error}`, ToastAndroid.LONG);
       }
     }
   };

app/src/pages/GetStarted.js

@@ -16,12 +16,10 @@ const GetStarted = ({ navigation }) => {
   const trans = i18n.text(activeLang);
 
   const getConfig = useCallback(async () => {
-    try {
-      const config = await crudConfig.getConfig();
-      if (config) {
-        setCurrentConfig(config);
-      }
-    } catch (error) {}
+    const config = await crudConfig.getConfig();
+    if (config) {
+      setCurrentConfig(config);
+    }
   }, []);
 
   const isServerURLDefined = useMemo(() => {

app/src/pages/Home.js

@@ -67,9 +67,9 @@ const Home = ({ navigation, route }) => {
           .filter((r) => r?.userId === currentUserId);
         setData(forms);
         setloading(false);
-      } catch {
+      } catch (error) {
         if (Platform.OS === 'android') {
-          ToastAndroid.show(trans.errorFormsNotLoaded, ToastAndroid.SHORT);
+          ToastAndroid.show(`SQL: ${error}`, ToastAndroid.SHORT);
         }
       }
     }

backend/api/v1/v1_data/models.py

@@ -53,9 +53,10 @@ def to_data_frame(self):
             "updated_by":
             self.updated_by.get_full_name() if self.updated_by else None,
             "created_at":
-            self.created.strftime("%B %d, %Y"),
+            self.created.strftime("%B %d, %Y %I:%M %p"),
             "updated_at":
-            self.updated.strftime("%B %d, %Y") if self.updated else None,
+            self.updated.strftime("%B %d, %Y %I:%M %p")
+            if self.updated else None,
         }
         for a in self.data_answer.order_by(
                 'question__question_group_id',

backend/api/v1/v1_data/serializers.py

@@ -1128,6 +1128,7 @@ def create(self, validated_data):
                 administration=data.get("administration"),
                 geo=data.get("geo"),
                 created_by=data.get("created_by"),
+                created=data.get("submitedAt") or timezone.now(),
             )
 
         for answer in validated_data.get("answer"):
@@ -1185,6 +1186,7 @@ def create(self, validated_data):
                     value=value,
                     options=option,
                     created_by=self.context.get("user"),
+                    created=data.get("submitedAt") or timezone.now(),
                 )
 
             # save to form data

backend/api/v1/v1_data/tasks.py

@@ -34,6 +34,7 @@ def seed_approved_data(data):
             administration=data.administration,
             geo=data.geo,
             created_by=data.created_by,
+            created=data.created,
         )
         data.data = form_data
         data.approved = True

backend/rtmis/settings.py

@@ -169,7 +169,7 @@
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Africa/Nairobi'
 
 USE_I18N = True
 

backend/utils/functions.py

@@ -1,11 +1,14 @@
+from django.utils import timezone
 from api.v1.v1_data.models import Answers, AnswerHistory
 from api.v1.v1_forms.constants import QuestionTypes
 
 
 def update_date_time_format(date):
     if date:
         # date = timezone.datetime.strptime(date, "%Y-%m-%d").date()
-        return date.date().strftime('%B %d, %Y')
+        if not timezone.is_naive(date):
+            return timezone.localtime(date).strftime("%Y-%m-%d %I:%M %p")
+        return date.strftime("%Y-%m-%d %I:%M %p")
     return None
 
 

frontend/src/components/filters/AdministrationDropdown.js

@@ -1,6 +1,6 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import "./style.scss";
-import { Select, Space } from "antd";
+import { Select, Space, Checkbox, Row, Col } from "antd";
 import PropTypes from "prop-types";
 import { store, api } from "../../lib";
 import { useCallback } from "react";
@@ -16,9 +16,12 @@ const AdministrationDropdown = ({
   currentId = null,
   onChange,
   limitLevel = false,
+  isSelectAllVillage = false,
+  selectedAdministrations = [],
   ...props
 }) => {
   const { user, administration, levels } = store.useState((state) => state);
+  const [checked, setChecked] = useState(false);
   /**
    * Get lowest level administrator from maxLevel.
    * otherwise, sort asc by level and get the last item from levels global state
@@ -49,6 +52,15 @@ const AdministrationDropdown = ({
     fetchUserAdmin();
   }, [fetchUserAdmin, persist]);
 
+  useEffect(() => {
+    const multiadministration = administration?.find(
+      (admLevel) => admLevel.level === lowestLevel.level - 1
+    )?.children;
+    if (multiadministration?.length === selectedAdministrations?.length) {
+      setChecked(true);
+    }
+  }, [administration, selectedAdministrations, lowestLevel.level]);
+
   const handleChange = async (e, index) => {
     if (!e) {
       return;
@@ -73,6 +85,39 @@ const AdministrationDropdown = ({
     }
   };
 
+  const handleSelectAllVillage = (e) => {
+    if (e.target.checked) {
+      setChecked(true);
+      let admItems = null;
+      const multiadministration = administration?.find(
+        (admLevel) => admLevel.level === lowestLevel.level - 1
+      )?.children;
+      admItems = multiadministration;
+      if (selectedAdministrations.length === admItems.length) {
+        return;
+      }
+      store.update((s) => {
+        s.administration = s.administration.concat(admItems);
+      });
+      if (onChange) {
+        const _values = admItems.map((item) => item.id);
+        onChange(_values);
+      }
+    } else {
+      setChecked(false);
+      store.update((s) => {
+        s.administration = s.administration.filter(
+          (data) => data.level <= lowestLevel.level - 1
+        );
+      });
+      if (onChange) {
+        onChange(
+          administration.filter((data) => data.level <= lowestLevel.level - 1)
+        );
+      }
+    }
+  };
+
   const handleClear = (index) => {
     store.update((s) => {
       s.administration.length = index + 1;
@@ -151,6 +196,15 @@ const AdministrationDropdown = ({
               );
             }
           })}
+        {isSelectAllVillage && maxLevel === 5 && (
+          <Row className="form-row">
+            <Col span={24}>
+              <Checkbox onChange={handleSelectAllVillage} checked={checked}>
+                Select all village
+              </Checkbox>
+            </Col>
+          </Row>
+        )}
       </Space>
     );
   }