diff --git a/.github/workflows/oblf-21stFeb-9.20.yml b/.github/workflows/oblf-21stFeb-9.20.yml
new file mode 100644
index 00000000..01c93c71
--- /dev/null
+++ b/.github/workflows/oblf-21stFeb-9.20.yml
@@ -0,0 +1,79 @@
+name: Deploy to oblf-21stFeb
+on:
+ push:
+ branches:
+ - oblf-21stFeb
+jobs:
+ build:
+ name: Generate Build and Deploy to DEV
+ # environment: PROD
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+
+ - name: Setup Node Env
+ uses: actions/setup-node@v3
+ with:
+ node-version: 21.1.0
+
+ - name: Generate React Build
+ run: |
+
+ yarn install
+ yarn build
+ - name: Create Lerna Bundles for Submodules
+ run: |
+ sh ./scripts/pack-prod-build.sh
+
+ - name: Show PWD
+ run: |
+ echo "Current Working Directory:"
+ pwd
+
+
+ - name: List Contents
+ run: |
+ echo "Contents of the current directory (in reverse order):"
+ ls -lr
+
+ # - name: List Contents
+ # run: |
+ # echo "Contents of the dist directory (in reverse order):"
+ # cd /home/runner/work/shiksha-frontend/shiksha-frontend/dist
+ # ls -lr
+
+ - name: Deploy to Server 1
+ uses: easingthemes/ssh-deploy@main
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.EC2_SSH_KEY }}
+ REMOTE_HOST: ${{ secrets.HOST_DNS }}
+ REMOTE_USER: ${{ secrets.USERNAME }}
+ TARGET: ${{ secrets.TARGET_DIR }}
+
+ - name: Set up SSH key
+ run: |
+ mkdir -p ~/.ssh
+ echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
+ chmod 600 ~/.ssh/id_rsa
+ # Add the SSH key to the known_hosts file (replace hostname with your actual hostname)
+ ssh-keyscan -H ${{ secrets.HOST_DNS }} >> ~/.ssh/known_hosts
+
+
+ # - name: Deploy with rsync
+ # run: |
+ # rsync -avz -e "ssh -i ~/.ssh/id_rsa" ./dist/ ${{ secrets.USERNAME }}@${{ secrets.HOST_DNS }}:/home/ubuntu/prasad
+
+
+ - name: Copy Build Artifact using Rsync
+ run: rsync -avz -e "ssh -p ${{ secrets.PORT }}" shiksha-ui.tar ${{ secrets.USERNAME }}@${{ secrets.HOST_DNS }}:/home/prasad
+
+ - name: Unzip Artifact to Correct Locations to Deploy
+ uses: appleboy/ssh-action@master
+ with:
+ host: ${{ secrets.HOST_DNS }}
+ username: ${{ secrets.USERNAME }}
+ key: ${{ secrets.EC2_SSH_KEY }}
+ script: |
+ cd /home/prasad
+ tar -xvf shiksha-ui.tar -C /var/www/shiksha.uniteframework.io/new
diff --git a/.well-known/assetlinks.json b/.well-known/assetlinks.json
new file mode 100644
index 00000000..b2a7e6d4
--- /dev/null
+++ b/.well-known/assetlinks.json
@@ -0,0 +1,8 @@
+[{
+ "relation": ["delegate_permission/common.handle_all_urls"],
+ "target": {
+ "namespace": "android_app",
+ "package_name": "io.uniteframework.shiksha.twa",
+ "sha256_cert_fingerprints": ["5D:27:14:88:B0:06:02:E1:20:BB:4E:41:88:76:FD:32:0F:A4:26:EC:FE:BD:DA:C1:70:88:89:8C:50:C8:E9:F3"]
+ }
+ }]
diff --git a/1.txt b/1.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000..a753bbaf
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,33 @@
+pipeline {
+ agent any
+ stages {
+ stage('clean workspace'){
+ steps{
+ cleanWs()
+ }
+ }
+ stage('Checkout'){
+
+ steps{
+
+ // git branch: 'main', credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-backend.git'
+ // checkout scmGit(branches: [[name: '*/oblf-21stFeb']], extensions: [], userRemoteConfigs: [[credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-backend.git']])
+ checkout scmGit(branches: [[name: '*/oblf-21stFeb']], extensions: [], userRemoteConfigs: [[credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-frontend.git']])
+
+ echo "========================== ***Repository cloned Successfully*** =========================="
+
+ }
+ }
+
+ stage ('Build&Deploy') {
+
+ steps {
+
+ sh 'yarn install'
+ sh 'yarn run build'
+ sh './scripts/pack-prod-build.sh'
+ }
+ }
+
+ }
+}
diff --git a/packages/cohort/src/pages/CohortDetails.js b/packages/cohort/src/pages/CohortDetails.js
index d16bb667..d4bd2aa2 100644
--- a/packages/cohort/src/pages/CohortDetails.js
+++ b/packages/cohort/src/pages/CohortDetails.js
@@ -1,7 +1,6 @@
import React from "react";
import {
Text,
- Box,
Pressable,
Image,
Avatar,
@@ -18,13 +17,11 @@ import { useTranslation } from "react-i18next";
import {
capture,
Layout,
- Tab,
overrideColorTheme,
- H3,
- IconByName,
Widget,
cohortRegistryService,
Loading,
+ attendanceRegistryService,
} from "@shiksha/common-lib";
import moment from "moment";
import manifest from "../manifest.json";
@@ -32,17 +29,23 @@ import { useParams } from "react-router-dom";
import Collapse from "@mui/material/Collapse";
const colors = overrideColorTheme();
+const SelfAttendanceSheet = React.lazy(() =>
+ import("profile/SelfAttendanceSheet")
+);
const CohortDetails = ({ footerLinks, setAlert, appName }) => {
const { t } = useTranslation();
const [selfAttendance, setSelfAttendance] = React.useState({});
const [showModal, setShowModal] = React.useState(false);
const [cohortDetails, setCohortDetails] = React.useState({});
+ const [cohortParentDetails, setCohortParentDetails] = React.useState(true);
const [toggleDetails, setToggleDetails] = React.useState(true);
const [fields, setFields] = React.useState([]);
const [loading, setLoading] = React.useState(true);
- let newAvatar = localStorage.getItem("firstName");
+ let newAvatar = localStorage.getItem("fullName");
+ const [userId, setUserId] = React.useState();
const { cohortId } = useParams();
+ const [attendanceStatusData, setAttendanceStatusData] = React.useState();
let cameraUrl = "";
let avatarUrlObject = cameraUrl
@@ -57,7 +60,7 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
data: [
{
title: t("Mark My Attendance"),
- link: "/classes",
+ //link: "/classes",
icon: "ParentLineIcon",
_box: {
bg: "widgetColor.500",
@@ -85,56 +88,67 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
},
],
},
- {
- data: [
- {
- title: t("Class Digital Observation"),
- link: "/classes",
- icon: "ParentLineIcon",
- _box: {
- bg: "widgetColor.700",
- },
- _icon: {
- color: "iconColor.700",
- },
- _text: { color: "warmGray.700" },
- },
- ],
- },
- {
- data: [
- {
- title: t("Class Phygital Assessment"),
- link: "/classes",
- icon: "ParentLineIcon",
- _box: {
- bg: "widgetColor.800",
- },
- _icon: {
- color: "iconColor.800",
- },
- _text: { color: "warmGray.700" },
- },
- ],
- },
- {
- data: [
- {
- title: t("View Class Reports"),
- link: "/classes",
- icon: "ParentLineIcon",
- _box: {
- bg: "widgetColor.1000",
- },
- _icon: {
- color: "iconColor.1000",
- },
- _text: { color: "warmGray.700" },
- },
- ],
- },
+ // commented the below code (not required for OBLF for now)
+ // {
+ // data: [
+ // {
+ // title: t("Class Digital Observation"),
+ // link: "/classes",
+ // icon: "ParentLineIcon",
+ // _box: {
+ // bg: "widgetColor.700",
+ // },
+ // _icon: {
+ // color: "iconColor.700",
+ // },
+ // _text: { color: "warmGray.700" },
+ // },
+ // ],
+ // },
+ // {
+ // data: [
+ // {
+ // title: t("Class Phygital Assessment"),
+ // link: "/classes",
+ // icon: "ParentLineIcon",
+ // _box: {
+ // bg: "widgetColor.800",
+ // },
+ // _icon: {
+ // color: "iconColor.800",
+ // },
+ // _text: { color: "warmGray.700" },
+ // },
+ // ],
+ // },
+ // {
+ // data: [
+ // {
+ // title: t("View Class Reports"),
+ // link: "/classes",
+ // icon: "ParentLineIcon",
+ // _box: {
+ // bg: "widgetColor.1000",
+ // },
+ // _icon: {
+ // color: "iconColor.1000",
+ // },
+ // _text: { color: "warmGray.700" },
+ // },
+ // ],
+ // },
];
+ let getInitials = function (string) {
+ let names = string.split(" "),
+ initials = names[0].substring(0, 1).toUpperCase();
+
+ if (names.length > 1) {
+ initials += names[names.length - 1].substring(0, 1).toUpperCase();
+ }
+ return initials;
+ };
+
const getFieldValues = (cohortsFields) => {
let fieldVals = [];
cohortsFields.map((item) => {
@@ -156,8 +170,34 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
setToggleDetails(!toggleDetails);
};
+ const handleOnPress = () => {
+ setUserId(userId);
+ setShowModal(true);
+ };
+
React.useEffect(() => {
const getData = async () => {
+ const currentDate = new Date().toLocaleDateString("en-CA"); // Format: "yyyy-mm-dd"
+ const searchData = {
+ limit: "string",
+ page: 0,
+ filters: {
+ contextId: { _eq: cohortId },
+ userId: { _eq: localStorage.getItem("id") },
+ contextType: { _eq: "class" },
+ attendanceDate: { _eq: currentDate },
+ },
+ };
+
+ // get status of use attendance from attendanceSearchData api
+ const attendanceSearchData =
+ await attendanceRegistryService.searchAttendance(searchData, {
+ tenantid: process.env.REACT_APP_TENANT_ID,
+ });
+
+ if (attendanceSearchData?.data && attendanceSearchData.data.length > 0) {
+ setAttendanceStatusData(attendanceSearchData);
+ }
const result = await cohortRegistryService.getCohortDetails(
{
cohortId: cohortId,
@@ -166,7 +206,6 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
tenantid: process.env.REACT_APP_TENANT_ID,
}
);
- console.log("result", result);
if (result.length) {
setCohortDetails(result[0]);
@@ -174,6 +213,17 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
getFieldValues(result[0].fields);
setSelfAttendance(result[0]);
}
+ const parentResult = await cohortRegistryService.getCohortDetails(
+ {
+ cohortId: result[0].parentId,
+ },
+ {
+ tenantid: process.env.REACT_APP_TENANT_ID,
+ }
+ );
+ if (parentResult.length) {
+ setCohortParentDetails(parentResult[0]);
+ }
}
setLoading(false);
};
@@ -185,72 +235,113 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
return ;
} else {
return (
- setShowModal(true)}>
- {cameraUrl ? (
-
- ) : (
- {newAvatar?.toUpperCase().substr(0, 2)}
- )}
-
- ),
- }}
- _appBar={{ languages: manifest.languages }}
- // subHeader={{t("THE_CLASS_YOU_TAKE")}
}
- _subHeader={{
- bg: colors?.cardBg,
- _text: {
- fontSize: "16px",
- fontWeight: "600",
- textTransform: "inherit",
- },
+
- {fields.length && (
-
-
+
+ {cameraUrl ? (
+
) : (
-
- )
+ {getInitials(newAvatar)}
+ )}
+
+ ),
+ }}
+ _appBar={{ languages: manifest.languages }}
+ // subHeader={{t("THE_CLASS_YOU_TAKE")}
}
+ _subHeader={{
+ bg: colors?.cardBg,
+ _text: {
+ fontSize: "16px",
+ fontWeight: "600",
+ textTransform: "inherit",
+ },
+ }}
+ _footer={footerLinks}
+ >
+ {fields.length > 0 && (
+
+
+ ) : (
+
+ )
+ }
+ onPress={handleToggleDetails}
+ >
+ {toggleDetails ? "Hide Details" : "Show Details"}
+
+
+
+ {fields.map((item, index) => {
+ return (
+
+ {item.label}:
+ {item.values}
+
+ );
+ })}
+
+
+ )}
+
+ {widgetData.map((item, index) => {
+ // Check if the title is "Mark My Attendance"
+ const isMarkMyAttendance =
+ item.data[0].title === t("Mark My Attendance");
+
+ // Modify the title based on the attendance status
+ let modifiedTitle = item?.data[0]?.title;
+ if (
+ isMarkMyAttendance &&
+ attendanceStatusData?.data[0]?.attendance
+ ) {
+ modifiedTitle += ` - ${attendanceStatusData?.data[0]?.attendance}`;
}
- onPress={handleToggleDetails}
- >
- {toggleDetails ? "Hide Details" : "Show Details"}
-
-
- {fields.map((item, index) => {
- return (
-
- {item.label}:
- {item.values}
-
- );
- })}
-
-
- )}
-
- {widgetData.map((item, index) => {
- return ;
- })}
-
-
+ // Assign onPress handler only to "Mark My Attendance" widget
+ return (
+
+ );
+ })}
+
+
+
);
}
};
diff --git a/packages/cohort/src/pages/CohortList.js b/packages/cohort/src/pages/CohortList.js
index e89c0625..a72239c6 100644
--- a/packages/cohort/src/pages/CohortList.js
+++ b/packages/cohort/src/pages/CohortList.js
@@ -2,7 +2,13 @@ import React, { useEffect, useState } from "react";
import { Box, HStack, VStack, Text, Heading } from "native-base";
import { useTranslation } from "react-i18next";
import { generatePath } from "react-router-dom";
-import { H4, Widget, cohortRegistryService, Loading, useWindowSize } from "@shiksha/common-lib";
+import {
+ H4,
+ Widget,
+ cohortRegistryService,
+ Loading,
+ useWindowSize,
+} from "@shiksha/common-lib";
// import ChooseClassActionSheet from "./Molecules/ChooseClassActionSheet";
export default function CohortList() {
@@ -13,24 +19,95 @@ export default function CohortList() {
const teacherId = localStorage.getItem("id");
useEffect(() => {
let ignore = false;
- const getData = async () => {
+ // Get the cohortIds from the cohortMembers having role as teacher for logged in user(teacher)
+ const getCohortIdsData = async () => {
if (!ignore) {
- setClasses(
- await cohortRegistryService.getAll(
+ const cohortMemebersData = await cohortRegistryService.getCohortMembers(
+ {
+ filters: {
+ userId: {
+ _in: teacherId,
+ },
+ role: { _eq: "teacher" },
+ },
+ },
+ {
+ tenantid: process.env.REACT_APP_TENANT_ID,
+ }
+ );
+ if (cohortMemebersData) {
+ const cohortIdsInfo = cohortMemebersData.map(
+ (item) => `${item.cohortId}`
+ );
+ const cohortIdsData = cohortIdsInfo.join(", ");
+ getData(cohortIdsData);
+ } else {
+ getData();
+ }
+ }
+ };
+
+ getCohortIdsData();
+
+ // Get the cohort
+ const getData = async (cohortIdsData) => {
+ if (!ignore) {
+ let classesData;
+ if (cohortIdsData) {
+ const cohortIdsDataArray = cohortIdsData
+ .split(",")
+ .map((param) => param.trim());
+ classesData = await cohortRegistryService.getAll(
+ {
+ filters: {
+ cohortId: {
+ _in: cohortIdsDataArray,
+ },
+ type: { _eq: "CLASS" },
+ },
+ },
+ {
+ tenantid: process.env.REACT_APP_TENANT_ID,
+ }
+ );
+ } else {
+ // If no cohortIdsData, call getAll without cohortIdsData
+ classesData = await cohortRegistryService.getAll(
{
teacherId: teacherId,
type: "class",
role: "teacher",
},
{
- tenantid: process.env.REACT_APP_TENANT_ID, //'fbe108db-e236-48a7-8230-80d34c370800' //process.env.TENANT_ID
+ tenantid: process.env.REACT_APP_TENANT_ID,
}
- )
+ );
+ }
+
+ // Fetch parent data for each class and add parent name to each class object
+ const updatedClassesData = await Promise.all(
+ classesData?.map(async (classItem) => {
+ const parentData = await cohortRegistryService.getCohortDetails(
+ {
+ cohortId: classItem?.parentId,
+ },
+ {
+ tenantid: process.env.REACT_APP_TENANT_ID,
+ }
+ );
+ const parentName =
+ parentData?.length > 0 ? parentData[0]?.name : ""; // Get parent name from the first object in the parentData array
+ return { ...classItem, parentName };
+ })
);
+ setClasses(updatedClassesData);
setLoading(false);
}
};
- getData();
+ // Cleanup function
+ return () => {
+ ignore = true;
+ };
}, [teacherId]);
if (loading) {
@@ -44,6 +121,7 @@ export default function CohortList() {
data={classes.map((item, index) => {
return {
title:
+ (item?.parentName ? item?.parentName + ", " : "") + " Level " +
(item?.name ? item?.name : "") +
(item?.section ? " • Sec " + item?.section : ""),
subTitle: t("CLASS_TEACHER"),
diff --git a/packages/cohort/src/pages/CohortMemberList.js b/packages/cohort/src/pages/CohortMemberList.js
index 3ddaac70..1bc05a2f 100644
--- a/packages/cohort/src/pages/CohortMemberList.js
+++ b/packages/cohort/src/pages/CohortMemberList.js
@@ -23,6 +23,7 @@ import {
cohortRegistryService,
Loading,
useWindowSize,
+ attendanceRegistryService,
} from "@shiksha/common-lib";
import moment from "moment";
import manifest from "../manifest.json";
@@ -40,6 +41,8 @@ export default function CohortMemberList({ footerLinks, appName }) {
const [width, height] = useWindowSize();
const [loading, setLoading] = React.useState(true);
const [cohortDetails, setCohortDetails] = React.useState({});
+ const [cohortParentDetails, setCohortParentDetails] = React.useState(true);
+ const [attendanceStatusData, setAttendanceStatusData] = React.useState();
let newAvatar = localStorage.getItem("firstName");
const [members, setMembers] = useState([]);
@@ -53,9 +56,29 @@ export default function CohortMemberList({ footerLinks, appName }) {
},
}
: {};
+ let getInitials = function (string) {
+ let names = string.split(' '), initials = names[0].substring(0, 1).toUpperCase();
+
+ if (names.length > 1) {
+ initials += names[names.length - 1].substring(0, 1).toUpperCase();
+ }
+ return initials;
+ };
useEffect(() => {
let ignore = false;
const getData = async () => {
+ const currentDate = new Date().toLocaleDateString("en-CA"); // Format: "yyyy-mm-dd"
+ const searchData = {
+ limit: "string",
+ page: 0,
+ filters: {
+ contextId: { _eq: cohortId },
+ userId: { _eq: userId },
+ contextType: { _eq: "class" },
+ attendanceDate: { _eq: currentDate },
+ },
+ };
+
if (!ignore) {
const results = await Promise.all([
cohortRegistryService.getCohortMembers(
@@ -64,6 +87,7 @@ export default function CohortMemberList({ footerLinks, appName }) {
page: 0,
filters: {
cohortId: { _eq: cohortId },
+ role: { _eq: "student" },
},
},
{
@@ -80,8 +104,46 @@ export default function CohortMemberList({ footerLinks, appName }) {
),
]);
- setMembers(results[0]);
+ // get status of use attendance from attendanceSearchData api
+ const attendanceSearchData =
+ await attendanceRegistryService.searchAttendance(searchData, {
+ Tenantid: process.env.REACT_APP_TENANT_ID,
+ });
+ if (
+ attendanceSearchData?.data &&
+ attendanceSearchData.data.length > 0
+ ) {
+ setAttendanceStatusData(attendanceSearchData.data);
+
+ // Merge attendance status into user data
+ const modifiedCohortMembers = results[0]?.map((member) => {
+ const attendanceRecord = attendanceSearchData.data.find(
+ (record) => record.userId === member.userId
+ );
+ return {
+ ...member,
+ attendanceStatus: attendanceRecord
+ ? attendanceRecord.attendance
+ : "",
+ };
+ });
+
+ setMembers(modifiedCohortMembers);
+ } else {
+ setMembers(results[0]);
+ }
setCohortDetails(results[1][0]);
+ const parentResult = await cohortRegistryService.getCohortDetails(
+ {
+ cohortId: results[1][0].parentId,
+ },
+ {
+ tenantid: process.env.REACT_APP_TENANT_ID,
+ }
+ );
+ if (parentResult.length) {
+ setCohortParentDetails(parentResult[0]);
+ }
setLoading(false);
}
};
@@ -97,11 +159,12 @@ export default function CohortMemberList({ footerLinks, appName }) {
appName,
userId,
setUserId,
+ members,
}}
>
@@ -114,7 +177,7 @@ export default function CohortMemberList({ footerLinks, appName }) {
size="50px"
/>
) : (
- {newAvatar?.toUpperCase().substr(0, 2)}
+ {getInitials(newAvatar)}
)}
),
@@ -137,6 +200,10 @@ export default function CohortMemberList({ footerLinks, appName }) {
{members.map((item, index) => {
+ const attendanceRecord = attendanceStatusData?.find(
+ (record) => record?.userId === item?.userId
+ );
+
return (
{item?.role}
+ {attendanceRecord ? (
+
+ ) : null}
-
+ */}
diff --git a/packages/common-lib/src/components/Widget.js b/packages/common-lib/src/components/Widget.js
index 4615eed0..9c32ce74 100644
--- a/packages/common-lib/src/components/Widget.js
+++ b/packages/common-lib/src/components/Widget.js
@@ -3,6 +3,7 @@ import React from 'react'
import { Link } from 'react-router-dom'
import IconByName from './IconByName'
import { BodySmall, H3, H4 } from './layout/HeaderTags'
+import { TouchableOpacity } from 'react-native'
const chunk = (array, chunk) => {
return [].concat.apply(
@@ -28,7 +29,7 @@ const PressableNew = ({ route, children, ...prop }) => {
)
}
-function Widget({ data, title }) {
+function Widget({ data, title, onpress }) {
const newData = chunk(data ? data : [], 2)
const rotate = {
bottom: '-25px',
@@ -43,83 +44,85 @@ function Widget({ data, title }) {
return (
{title}
-
- {newData.map((subData, index) => (
-
- {subData.map((item, subIndex) => (
-
- {item?.label ? (
-
- {item.label}
-
- ) : (
- ''
- )}
-
-
-
- {item?.title}
- {item?.subTitle}
-
-
- {item.icon ? (
-
-
-
-
+
+
+ {newData.map((subData, index) => (
+
+ {subData.map((item, subIndex) => (
+
+ {item?.label ? (
+
+ {item.label}
+
) : (
-
+ ''
)}
-
-
- ))}
-
- ))}
-
+
+
+
+ {item?.title}
+ {item?.subTitle}
+
+
+ {item.icon ? (
+
+
+
+
+ ) : (
+
+ )}
+
+
+ ))}
+
+ ))}
+
+
)
}
diff --git a/packages/common-lib/src/components/layout/AppBar.js b/packages/common-lib/src/components/layout/AppBar.js
index f7d9597b..e24945b9 100644
--- a/packages/common-lib/src/components/layout/AppBar.js
+++ b/packages/common-lib/src/components/layout/AppBar.js
@@ -170,7 +170,7 @@ export default function AppBar({
)
}}
>
- {languages?.map((e, index) => (
+ {/* {languages?.map((e, index) => (
{e.title}
- ))}
+ ))} */}
setLang('logout')}>
Logout
diff --git a/packages/common-lib/src/config/footerLinks.js b/packages/common-lib/src/config/footerLinks.js
index 3c342d97..abc05844 100644
--- a/packages/common-lib/src/config/footerLinks.js
+++ b/packages/common-lib/src/config/footerLinks.js
@@ -13,13 +13,13 @@ export default [
route: '/cohorts',
routeparameters: {}
},
- {
- title: 'ADMIN',
- icon: 'GovernmentLineIcon',
- moduleName: 'admin',
- route: '/admin',
- routeparameters: {}
- },
+ // {
+ // title: 'ADMIN',
+ // icon: 'GovernmentLineIcon',
+ // moduleName: 'admin',
+ // route: '/admin',
+ // routeparameters: {}
+ // },
// {
// title: 'TEACHING',
// icon: 'BookOpenLineIcon',
diff --git a/packages/common-lib/src/configapimock.json b/packages/common-lib/src/configapimock.json
index f5662f36..6d8c6038 100644
--- a/packages/common-lib/src/configapimock.json
+++ b/packages/common-lib/src/configapimock.json
@@ -1,800 +1,800 @@
[
- {
- "id": "d404d309-1a55-4a7f-9aae-e7dac5c22ffe",
- "configId": "d404d309-1a55-4a7f-9aae-e7dac5c22ffe",
- "module": "attendance",
- "key": "captureSelfAttendace",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:30.063498+00:00",
- "updatedAt": "2022-09-20T10:42:05.417667+00:00"
- },
- {
- "id": "8d6d1366-e21c-49d7-813c-3b971cbfe94b",
- "configId": "8d6d1366-e21c-49d7-813c-3b971cbfe94b",
- "module": "attendance",
- "key": "attendance.channels_of_communication",
- "value": "[\"SMS\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:10:52.708698+00:00",
- "updatedAt": "2022-09-20T10:42:05.417433+00:00"
- },
- {
- "id": "f05f93d4-4ba2-4c78-a086-360e294cb590",
- "configId": "f05f93d4-4ba2-4c78-a086-360e294cb590",
- "module": "attendance",
- "key": "specialDuties",
- "value": "[\"election\",\"evaluation\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:30.064526+00:00",
- "updatedAt": "2022-09-20T10:42:05.415501+00:00"
- },
- {
- "id": "ec086482-b132-4773-b5e0-0d8517eb4b0c",
- "configId": "ec086482-b132-4773-b5e0-0d8517eb4b0c",
- "module": "attendance",
- "key": "report_types",
- "value": "[\"monthlyReport\",\"dailyReport\",\"weeklyReport\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:36.463767+00:00",
- "updatedAt": "2022-09-20T10:42:05.419927+00:00"
- },
- {
- "id": "2a8cafa1-ec60-4666-b2bb-72c74d6fd0ac",
- "configId": "2a8cafa1-ec60-4666-b2bb-72c74d6fd0ac",
- "module": "attendance",
- "key": "captureLocation",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:30.055671+00:00",
- "updatedAt": "2022-09-20T10:42:05.415539+00:00"
- },
- {
- "id": "891d2fab-d1f4-489e-857b-709bd06fda29",
- "configId": "891d2fab-d1f4-489e-857b-709bd06fda29",
- "module": "assessment",
- "key": "spot-assessment.questionSource",
- "value": "diksha",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.536812+00:00",
- "updatedAt": "2022-09-20T13:11:35.832399+00:00"
- },
- {
- "id": "bc294ae6-995b-4d30-bfdc-c80d89cd66c0",
- "configId": "bc294ae6-995b-4d30-bfdc-c80d89cd66c0",
- "module": "myprofile",
- "key": "servicedetails.serviceDetailDisplay",
- "value": "[\"joiningDesignation\",\"leavingDesignation\",\"dateOfJoining\",\"dateOfRelieving\",\"cadre\",\"placeOfPosting\",\"organizationName\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T03:57:48.235627+00:00",
- "updatedAt": "2022-09-14T04:07:05.751769+00:00"
- },
- {
- "id": "68b729be-9a64-4821-bca9-fa9693393962",
- "configId": "68b729be-9a64-4821-bca9-fa9693393962",
- "module": "attendance",
- "key": "submit_by",
- "value": "\"17:00\"",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:30.063343+00:00",
- "updatedAt": "2022-09-20T10:42:05.417243+00:00"
- },
- {
- "id": "7cc73af5-b246-4654-a375-420e3d4518cc",
- "configId": "7cc73af5-b246-4654-a375-420e3d4518cc",
- "module": "attendance",
- "key": "capture_selfie",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:30.064001+00:00",
- "updatedAt": "2022-09-20T10:42:05.417252+00:00"
- },
- {
- "id": "250ff3b1-9c3f-4dcb-853a-bfa0489dcd69",
- "configId": "250ff3b1-9c3f-4dcb-853a-bfa0489dcd69",
- "module": "attendance",
- "key": "attendance_states_of_staff",
- "value": "[\"Present\",\"Absent\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:11:30.062767+00:00",
- "updatedAt": "2022-09-20T10:42:05.414808+00:00"
- },
- {
- "id": "82aa2a32-36d2-4063-8a34-710f980afe04",
- "configId": "82aa2a32-36d2-4063-8a34-710f980afe04",
- "module": "attendance",
- "key": "attendance.event_triggers_to_send_attendance_notification",
- "value": "[\"Absent_Today\",\"Absent_Yesterday\",\"Present_Everyday\",\"Absent_ForLast3Days\",\"80percent_present\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:10:52.702417+00:00",
- "updatedAt": "2022-09-20T10:42:05.413728+00:00"
- },
- {
- "id": "884d5595-c3e5-490f-8643-2429eb988f97",
- "configId": "884d5595-c3e5-490f-8643-2429eb988f97",
- "module": "attendance",
- "key": "Attendance.report_types",
- "value": "[\"daily-report\",\"weekly-report\",\"monthly-report\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:10:00.472548+00:00",
- "updatedAt": "2022-09-20T10:42:05.417774+00:00"
- },
- {
- "id": "513ad53a-3577-436f-a5cb-290add761976",
- "configId": "513ad53a-3577-436f-a5cb-290add761976",
- "module": "myschool",
- "key": "schooldetails.school-report",
- "value": "[\"attendance\",\"assessment\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-12T16:44:33.738115+00:00",
- "updatedAt": "2022-09-14T19:35:15.979379+00:00"
- },
- {
- "id": "ba37ad98-6533-4038-8021-edc8f40e4fe5",
- "configId": "ba37ad98-6533-4038-8021-edc8f40e4fe5",
- "module": "attendance",
- "key": "attendance.allowed_role_to_send_attendance_notification",
- "value": "[\"state_admin\",\"school_admin\",\"teacher\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:10:52.701734+00:00",
- "updatedAt": "2022-09-20T10:42:05.417317+00:00"
- },
- {
- "id": "f685329a-8bdb-4da6-92b3-de2f3dc98346",
- "configId": "f685329a-8bdb-4da6-92b3-de2f3dc98346",
- "module": "general",
- "key": "attendance.allowed_role_to_send_attendance_notification",
- "value": "[\"state_deployer\",\"state_admin\",\"school_admin\",\"teacher\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:34.328515+00:00",
- "updatedAt": "2022-09-01T04:14:34.328515+00:00"
- },
- {
- "id": "c145c5b0-2984-4071-a8d2-65cfd44e4780",
- "configId": "c145c5b0-2984-4071-a8d2-65cfd44e4780",
- "module": "general",
- "key": "attendance.channels_of_communication",
- "value": "[\"SMS\",\"Whatsapp\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:34.328527+00:00",
- "updatedAt": "2022-09-01T04:14:34.328527+00:00"
- },
- {
- "id": "c02fca84-e558-4244-b04e-5d2905c330a7",
- "configId": "c02fca84-e558-4244-b04e-5d2905c330a7",
- "module": "general",
- "key": "attendance.notification_module",
- "value": "[\"attendance\",\"worksheet\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:34.329396+00:00",
- "updatedAt": "2022-09-01T04:14:34.329396+00:00"
- },
- {
- "id": "734d352d-a426-40e5-abe7-bf07f4bc1731",
- "configId": "734d352d-a426-40e5-abe7-bf07f4bc1731",
- "module": "theme",
- "key": "theme.forModules",
- "value": "\"joyFull\"",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:09.231205+00:00",
- "updatedAt": "2022-09-21T12:36:49.646489+00:00"
- },
- {
- "id": "3a3aaab4-cb2b-441f-937b-dcce76e7496c",
- "configId": "3a3aaab4-cb2b-441f-937b-dcce76e7496c",
- "module": "myprofile",
- "key": "servicedetails.personalDetailDisplay",
- "value": "[\"phoneNumber\",\"email\",\"gender\",\"designation\",\"cadre\",\"profQualification\",\"joiningDate\",\"subjectIds\",\"retirementDate\",\"workingStatus\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T03:57:48.235657+00:00",
- "updatedAt": "2022-09-14T04:07:05.762491+00:00"
- },
- {
- "id": "54f013ce-388e-4dc4-bf46-dd11f4283bd4",
- "configId": "54f013ce-388e-4dc4-bf46-dd11f4283bd4",
- "module": "assessment",
- "key": "spot-assessment.allowSharingSpotAssessmentReport",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.536583+00:00",
- "updatedAt": "2022-09-19T16:44:40.111635+00:00"
- },
- {
- "id": "bfce8abb-abf1-4fe5-9225-f26e8bbc5874",
- "configId": "bfce8abb-abf1-4fe5-9225-f26e8bbc5874",
- "module": "myschool",
- "key": "schooldetails.schools_fields",
- "value": "[\"board\",\"district\",\"address\",\"mediumOfInstruction\",\"phoneNumber\",\"headmaster\",\"block\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-12T16:44:33.748953+00:00",
- "updatedAt": "2022-09-14T19:35:15.979148+00:00"
- },
- {
- "id": "ac3d65ed-6f6e-45d8-b0c6-a2a4249fe2bc",
- "configId": "ac3d65ed-6f6e-45d8-b0c6-a2a4249fe2bc",
- "module": "assessment",
- "key": "spot-assessment.limitOfNumberOfQuestions",
- "value": "8",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.553227+00:00",
- "updatedAt": "2022-09-19T16:44:40.097852+00:00"
- },
- {
- "id": "ce60d734-0ac8-47e8-bb9d-7d653162c3fb",
- "configId": "ce60d734-0ac8-47e8-bb9d-7d653162c3fb",
- "module": "assessment",
- "key": "spot-assessment.channelNotificationSpotAssessmentList",
- "value": "[\"sms\",\"whatsApp\",\"telegram\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.565574+00:00",
- "updatedAt": "2022-09-19T16:44:40.119217+00:00"
- },
- {
- "id": "24b28775-a3e9-4b9f-bd65-8e995dc72db3",
- "configId": "24b28775-a3e9-4b9f-bd65-8e995dc72db3",
- "module": "myprofile",
- "key": "servicedetails.workhistoryDetailDisplay",
- "value": "[\"joiningDesignation\",\"leavingDesignation\",\"dateOfJoining\",\"dateOfRelieving\",\"cadre\",\"placeOfPosting\",\"organizationName\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T03:57:48.237157+00:00",
- "updatedAt": "2022-09-14T04:07:05.762312+00:00"
- },
- {
- "id": "856cc8be-2137-435b-98b8-890261c856b6",
- "configId": "856cc8be-2137-435b-98b8-890261c856b6",
- "module": "myschool",
- "key": "schooldetails.school_adinistrative_details",
- "value": "[\"student_in_all_categories\",\"teacher_in_all_categories\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-12T16:44:33.749238+00:00",
- "updatedAt": "2022-09-14T19:35:15.979131+00:00"
- },
- {
- "id": "90d2bf90-ddec-491f-82b8-8d86278381f0",
- "configId": "90d2bf90-ddec-491f-82b8-8d86278381f0",
- "module": "assessment",
- "key": "spot-assessment.allowSendingNotificationSpotAssessment",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.561613+00:00",
- "updatedAt": "2022-09-19T16:44:40.115348+00:00"
- },
- {
- "id": "f22d8855-cc8a-45b3-8f81-47bb3291d93b",
- "configId": "f22d8855-cc8a-45b3-8f81-47bb3291d93b",
- "module": "assessment",
- "key": "spot-assessment.questionSourceOral",
- "value": "\"google-read-along\"",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.555525+00:00",
- "updatedAt": "2022-09-19T16:44:40.114866+00:00"
- },
- {
- "id": "12483453-48ab-46e7-a88b-971278a6e503",
- "configId": "12483453-48ab-46e7-a88b-971278a6e503",
- "module": "myprofile",
- "key": "servicedetails.allow-display-past-workhistory",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T03:57:48.239477+00:00",
- "updatedAt": "2022-09-14T04:07:05.760488+00:00"
- },
- {
- "id": "c05c4ac4-40e6-4a8e-96d7-d2642d724444",
- "configId": "c05c4ac4-40e6-4a8e-96d7-d2642d724444",
- "module": "assessment",
- "key": "spot-assessment.allowDownloadSpotAssessmentReport",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.555591+00:00",
- "updatedAt": "2022-09-19T16:44:40.114915+00:00"
- },
- {
- "id": "f748aea1-3c65-47d9-8631-3a917dcc99a8",
- "configId": "f748aea1-3c65-47d9-8631-3a917dcc99a8",
- "module": "myvisits",
- "key": "schooldetails.monthlytargetforschool",
- "value": "3",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T09:21:33.764168+00:00",
- "updatedAt": "2022-09-21T10:48:23.314054+00:00"
- },
- {
- "id": "b7440878-c748-4a50-b3fc-e9072901c49f",
- "configId": "b7440878-c748-4a50-b3fc-e9072901c49f",
- "module": "myvisits",
- "key": "schooldetails.school_recommendations_rule",
- "value": "\"last2months\"",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T09:21:33.764218+00:00",
- "updatedAt": "2022-09-21T10:48:23.314807+00:00"
- },
- {
- "id": "36d6e27a-3c4c-4558-b94d-58bf0ed95be0",
- "configId": "36d6e27a-3c4c-4558-b94d-58bf0ed95be0",
- "module": "worksheet",
- "key": "worksheet.worksheetTemplate",
- "value": "[\"with-answers\",\"without-answers\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.382832+00:00",
- "updatedAt": "2022-10-03T10:46:54.752999+00:00"
- },
- {
- "id": "fb9e5a68-7e38-46ad-a83e-509ce0ac0a92",
- "configId": "fb9e5a68-7e38-46ad-a83e-509ce0ac0a92",
- "module": "roles",
- "key": "roles.mentor",
- "value": "[\"app\",\"visits\",\"schools\",\"classes\",\"assessment\",\"attendance\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:13:40.32687+00:00",
- "updatedAt": "2022-10-07T10:18:38.246437+00:00"
- },
- {
- "id": "565ab3e8-f5b9-4ecb-9255-32b5544a48df",
- "configId": "565ab3e8-f5b9-4ecb-9255-32b5544a48df",
- "module": "worksheet",
- "key": "question-bank.questionResource",
- "value": "[\"diksha\",\"khan-academy\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.389315+00:00",
- "updatedAt": "2022-10-03T10:46:54.75307+00:00"
- },
- {
- "id": "f02a6fe6-2e65-4e12-96d4-05f00640e70c",
- "configId": "f02a6fe6-2e65-4e12-96d4-05f00640e70c",
- "module": "worksheet",
- "key": "attendance.channels_of_communication",
- "value": "[\"SMS\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:50.333966+00:00",
- "updatedAt": "2022-10-03T10:46:54.771693+00:00"
- },
- {
- "id": "5e7944a4-b551-40fe-8799-cd28a880b13a",
- "configId": "5e7944a4-b551-40fe-8799-cd28a880b13a",
- "module": "worksheet",
- "key": "worksheet.configureAutoGenerateWorksheetGetFilter",
- "value": "[\"gradeLevel\",\"subject\",\"topic\",\"number_of_questions\",\"source\",\"qType\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.39672+00:00",
- "updatedAt": "2022-10-03T10:46:54.768796+00:00"
- },
- {
- "id": "1a007f3b-d4d5-44da-adfe-ee5c4fdbc1d9",
- "configId": "1a007f3b-d4d5-44da-adfe-ee5c4fdbc1d9",
- "module": "worksheet",
- "key": "question-bank.questionMetadata",
- "value": "[\"class\",\"subject\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.403575+00:00",
- "updatedAt": "2022-10-03T10:46:54.769062+00:00"
- },
- {
- "id": "92be5c72-ba75-44ca-87cc-4ad77f2fc94c",
- "configId": "92be5c72-ba75-44ca-87cc-4ad77f2fc94c",
- "module": "worksheet",
- "key": "worksheet.configureWorksheetGetFilter",
- "value": "[\"source\",\"gradeLevel\",\"subject\",\"topic\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.357724+00:00",
- "updatedAt": "2022-10-03T10:46:54.761976+00:00"
- },
- {
- "id": "35ae7458-4feb-4f20-8fd6-43f6fe2f83af",
- "configId": "35ae7458-4feb-4f20-8fd6-43f6fe2f83af",
- "module": "worksheet",
- "key": "worksheet.allow-autogenerating-worksheet",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.380714+00:00",
- "updatedAt": "2022-10-03T10:46:54.774819+00:00"
- },
- {
- "id": "b1d7fbfb-8352-4c27-8781-34517ce6a728",
- "configId": "b1d7fbfb-8352-4c27-8781-34517ce6a728",
- "module": "worksheet",
- "key": "attendance.allowedWorksheetRelatedNotification",
- "value": "[\"state-deployer\",\"state-admin\",\"teacher\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:50.338429+00:00",
- "updatedAt": "2022-10-03T10:46:54.784323+00:00"
- },
- {
- "id": "f3718a46-5b3e-4cfa-9eab-62fcfbc61e8f",
- "configId": "f3718a46-5b3e-4cfa-9eab-62fcfbc61e8f",
- "module": "worksheet",
- "key": "worksheet.worksheetMetadata",
- "value": "[\"grade\",\"subject\",\"topic\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.356935+00:00",
- "updatedAt": "2022-10-03T10:46:54.787539+00:00"
- },
- {
- "id": "711f8d62-bca0-4ebe-a146-cd98ea370389",
- "configId": "711f8d62-bca0-4ebe-a146-cd98ea370389",
- "module": "attendance",
- "key": "class_attendance.mark_all_attendance_at_once",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:09:38.768869+00:00",
- "updatedAt": "2022-10-07T06:47:59.499582+00:00"
- },
- {
- "id": "44d35121-2b8f-48be-8ad4-0ab3acb589c1",
- "configId": "44d35121-2b8f-48be-8ad4-0ab3acb589c1",
- "module": "attendance",
- "key": "class_attendance.date_till_previous_attendance_allow",
- "value": "\"2022-04-01\"",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:09:38.782905+00:00",
- "updatedAt": "2022-10-07T06:47:59.499921+00:00"
- },
- {
- "id": "e1f5add4-0796-40ee-ac90-42189814e996",
- "configId": "e1f5add4-0796-40ee-ac90-42189814e996",
- "module": "attendance",
- "key": "attendance.order_of_attendance_card",
- "value": "\"Alphabetically\"",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:09:38.783275+00:00",
- "updatedAt": "2022-10-07T06:47:59.499551+00:00"
- },
- {
- "id": "7488f991-46d0-4852-967f-90a13ce754ea",
- "configId": "7488f991-46d0-4852-967f-90a13ce754ea",
- "module": "attendance",
- "key": "class_attendance.submit_by",
- "value": "17",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:09:38.774491+00:00",
- "updatedAt": "2022-10-07T06:47:59.508722+00:00"
- },
- {
- "id": "f797e123-443c-4ad0-a305-3d82fbeeeb81",
- "configId": "f797e123-443c-4ad0-a305-3d82fbeeeb81",
- "module": "attendance",
- "key": "class_attendance.no_of_day_display_on_attendance_screen",
- "value": "5",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:09:38.783299+00:00",
- "updatedAt": "2022-10-07T06:47:59.50861+00:00"
- },
- {
- "id": "e50b3604-4df4-46ed-87ed-e89cc961aa11",
- "configId": "e50b3604-4df4-46ed-87ed-e89cc961aa11",
- "module": "attendance",
- "key": "attendance.default_attendance_states",
- "value": "[\"Present\",\"Absent\",\"Unmarked\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T11:15:56.439893+00:00",
- "updatedAt": "2022-10-07T06:47:59.511259+00:00"
- },
- {
- "id": "cf632401-03b1-480c-9647-e383517ddca2",
- "configId": "cf632401-03b1-480c-9647-e383517ddca2",
- "module": "assessment",
- "key": "spot-assessment.dataPoints",
- "value": "[\"overall-class-participation\",\"100%-achievers\",\"student-wise-assesment\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-02T13:25:41.559954+00:00",
- "updatedAt": "2022-09-19T16:44:40.116486+00:00"
- },
- {
- "id": "7147fc21-f0f0-48cc-9af6-eb892342f642",
- "configId": "7147fc21-f0f0-48cc-9af6-eb892342f642",
- "module": "myvisits",
- "key": "schooldetails.monthlytargetforteacher",
- "value": "20",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-14T09:21:33.772487+00:00",
- "updatedAt": "2022-09-21T10:48:23.314425+00:00"
- },
- {
- "id": "731a5733-d272-4ece-b207-5e5cf94262ab",
- "configId": "731a5733-d272-4ece-b207-5e5cf94262ab",
- "module": "roles",
- "key": "roles.teacher",
- "value": "[\"mylearning\",\"attendance\",\"assessment\",\"classes\",\"notification\",\"profile\",\"schools\",\"student\",\"calendar\",\"app\",\"visits\",\"hpAssessment\",\"worksheet\",\"issues\",\"cohort\",\"admin\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:13:40.327969+00:00",
- "updatedAt": "2022-10-07T10:18:38.245672+00:00"
- },
- {
- "id": "62feb3e3-623f-46ab-b55d-7f11ef4d5c62",
- "configId": "62feb3e3-623f-46ab-b55d-7f11ef4d5c62",
- "module": "roles",
- "key": "roles.monitor",
- "value": "[\"schools\",\"visits\",\"app\",\"assessment\",\"attendance\",\"classes\",\"student\",\"calendar\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:13:40.32763+00:00",
- "updatedAt": "2022-10-07T10:18:38.246411+00:00"
- },
- {
- "id": "310e7f06-5735-430e-9158-e679ccb589eb",
- "configId": "310e7f06-5735-430e-9158-e679ccb589eb",
- "module": "worksheet",
- "key": "worksheet.allow-download-worksheet",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.384544+00:00",
- "updatedAt": "2022-10-03T10:46:54.753436+00:00"
- },
- {
- "id": "9a9eb717-b82a-4f51-bded-bdbbbcc6b7ca",
- "configId": "9a9eb717-b82a-4f51-bded-bdbbbcc6b7ca",
- "module": "worksheet",
- "key": "worksheet.configureWorksheetSortOptions",
- "value": "[\"low-to-high\",\"high-to-low\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.38467+00:00",
- "updatedAt": "2022-10-03T10:46:54.756809+00:00"
- },
- {
- "id": "0e749423-9c59-48cc-8317-c5ced46d7190",
- "configId": "0e749423-9c59-48cc-8317-c5ced46d7190",
- "module": "worksheet",
- "key": "worksheet.show-correct-answer",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.376176+00:00",
- "updatedAt": "2022-10-03T10:46:54.764987+00:00"
- },
- {
- "id": "5cc419b5-6d70-4007-a280-12aa7738d5fa",
- "configId": "5cc419b5-6d70-4007-a280-12aa7738d5fa",
- "module": "worksheet",
- "key": "worksheet.allow-sharing-worksheet",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.402028+00:00",
- "updatedAt": "2022-10-03T10:46:54.758038+00:00"
- },
- {
- "id": "11b5046d-809a-4f4a-bb6d-a43f60b0a470",
- "configId": "11b5046d-809a-4f4a-bb6d-a43f60b0a470",
- "module": "worksheet",
- "key": "worksheet.manage-template",
- "value": "true",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.38923+00:00",
- "updatedAt": "2022-10-03T10:46:54.760935+00:00"
- },
- {
- "id": "bfbe15c9-372f-46dc-8775-dde58fc0b18c",
- "configId": "bfbe15c9-372f-46dc-8775-dde58fc0b18c",
- "module": "worksheet",
- "key": "question-bank.configureQuestionGetFilter",
- "value": "[\"gradeLevel\",\"subject\",\"topic\",\"learning-outcome\",\"source\",\"difficulty-level\",\"level\"]",
- "context": "",
- "contextId": "",
- "canOverride": true,
- "overrideBy": "",
- "isPublic": true,
- "createdAt": "2022-09-01T04:14:45.355548+00:00",
- "updatedAt": "2022-10-03T10:46:54.770146+00:00"
- }
- ]
\ No newline at end of file
+ {
+ "id": "d404d309-1a55-4a7f-9aae-e7dac5c22ffe",
+ "configId": "d404d309-1a55-4a7f-9aae-e7dac5c22ffe",
+ "module": "attendance",
+ "key": "captureSelfAttendace",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:30.063498+00:00",
+ "updatedAt": "2022-09-20T10:42:05.417667+00:00"
+ },
+ {
+ "id": "8d6d1366-e21c-49d7-813c-3b971cbfe94b",
+ "configId": "8d6d1366-e21c-49d7-813c-3b971cbfe94b",
+ "module": "attendance",
+ "key": "attendance.channels_of_communication",
+ "value": "[\"SMS\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:10:52.708698+00:00",
+ "updatedAt": "2022-09-20T10:42:05.417433+00:00"
+ },
+ {
+ "id": "f05f93d4-4ba2-4c78-a086-360e294cb590",
+ "configId": "f05f93d4-4ba2-4c78-a086-360e294cb590",
+ "module": "attendance",
+ "key": "specialDuties",
+ "value": "[\"election\",\"evaluation\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:30.064526+00:00",
+ "updatedAt": "2022-09-20T10:42:05.415501+00:00"
+ },
+ {
+ "id": "ec086482-b132-4773-b5e0-0d8517eb4b0c",
+ "configId": "ec086482-b132-4773-b5e0-0d8517eb4b0c",
+ "module": "attendance",
+ "key": "report_types",
+ "value": "[\"monthlyReport\",\"dailyReport\",\"weeklyReport\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:36.463767+00:00",
+ "updatedAt": "2022-09-20T10:42:05.419927+00:00"
+ },
+ {
+ "id": "2a8cafa1-ec60-4666-b2bb-72c74d6fd0ac",
+ "configId": "2a8cafa1-ec60-4666-b2bb-72c74d6fd0ac",
+ "module": "attendance",
+ "key": "captureLocation",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:30.055671+00:00",
+ "updatedAt": "2022-09-20T10:42:05.415539+00:00"
+ },
+ {
+ "id": "891d2fab-d1f4-489e-857b-709bd06fda29",
+ "configId": "891d2fab-d1f4-489e-857b-709bd06fda29",
+ "module": "assessment",
+ "key": "spot-assessment.questionSource",
+ "value": "diksha",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.536812+00:00",
+ "updatedAt": "2022-09-20T13:11:35.832399+00:00"
+ },
+ {
+ "id": "bc294ae6-995b-4d30-bfdc-c80d89cd66c0",
+ "configId": "bc294ae6-995b-4d30-bfdc-c80d89cd66c0",
+ "module": "myprofile",
+ "key": "servicedetails.serviceDetailDisplay",
+ "value": "[\"joiningDesignation\",\"leavingDesignation\",\"dateOfJoining\",\"dateOfRelieving\",\"cadre\",\"placeOfPosting\",\"organizationName\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T03:57:48.235627+00:00",
+ "updatedAt": "2022-09-14T04:07:05.751769+00:00"
+ },
+ {
+ "id": "68b729be-9a64-4821-bca9-fa9693393962",
+ "configId": "68b729be-9a64-4821-bca9-fa9693393962",
+ "module": "attendance",
+ "key": "submit_by",
+ "value": "\"17:00\"",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:30.063343+00:00",
+ "updatedAt": "2022-09-20T10:42:05.417243+00:00"
+ },
+ {
+ "id": "7cc73af5-b246-4654-a375-420e3d4518cc",
+ "configId": "7cc73af5-b246-4654-a375-420e3d4518cc",
+ "module": "attendance",
+ "key": "capture_selfie",
+ "value": "false",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:30.064001+00:00",
+ "updatedAt": "2022-09-20T10:42:05.417252+00:00"
+ },
+ {
+ "id": "250ff3b1-9c3f-4dcb-853a-bfa0489dcd69",
+ "configId": "250ff3b1-9c3f-4dcb-853a-bfa0489dcd69",
+ "module": "attendance",
+ "key": "attendance_states_of_staff",
+ "value": "[\"Present\",\"Absent\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:11:30.062767+00:00",
+ "updatedAt": "2022-09-20T10:42:05.414808+00:00"
+ },
+ {
+ "id": "82aa2a32-36d2-4063-8a34-710f980afe04",
+ "configId": "82aa2a32-36d2-4063-8a34-710f980afe04",
+ "module": "attendance",
+ "key": "attendance.event_triggers_to_send_attendance_notification",
+ "value": "[\"Absent_Today\",\"Absent_Yesterday\",\"Present_Everyday\",\"Absent_ForLast3Days\",\"80percent_present\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:10:52.702417+00:00",
+ "updatedAt": "2022-09-20T10:42:05.413728+00:00"
+ },
+ {
+ "id": "884d5595-c3e5-490f-8643-2429eb988f97",
+ "configId": "884d5595-c3e5-490f-8643-2429eb988f97",
+ "module": "attendance",
+ "key": "Attendance.report_types",
+ "value": "[\"daily-report\",\"weekly-report\",\"monthly-report\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:10:00.472548+00:00",
+ "updatedAt": "2022-09-20T10:42:05.417774+00:00"
+ },
+ {
+ "id": "513ad53a-3577-436f-a5cb-290add761976",
+ "configId": "513ad53a-3577-436f-a5cb-290add761976",
+ "module": "myschool",
+ "key": "schooldetails.school-report",
+ "value": "[\"attendance\",\"assessment\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-12T16:44:33.738115+00:00",
+ "updatedAt": "2022-09-14T19:35:15.979379+00:00"
+ },
+ {
+ "id": "ba37ad98-6533-4038-8021-edc8f40e4fe5",
+ "configId": "ba37ad98-6533-4038-8021-edc8f40e4fe5",
+ "module": "attendance",
+ "key": "attendance.allowed_role_to_send_attendance_notification",
+ "value": "[\"state_admin\",\"school_admin\",\"teacher\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:10:52.701734+00:00",
+ "updatedAt": "2022-09-20T10:42:05.417317+00:00"
+ },
+ {
+ "id": "f685329a-8bdb-4da6-92b3-de2f3dc98346",
+ "configId": "f685329a-8bdb-4da6-92b3-de2f3dc98346",
+ "module": "general",
+ "key": "attendance.allowed_role_to_send_attendance_notification",
+ "value": "[\"state_deployer\",\"state_admin\",\"school_admin\",\"teacher\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:34.328515+00:00",
+ "updatedAt": "2022-09-01T04:14:34.328515+00:00"
+ },
+ {
+ "id": "c145c5b0-2984-4071-a8d2-65cfd44e4780",
+ "configId": "c145c5b0-2984-4071-a8d2-65cfd44e4780",
+ "module": "general",
+ "key": "attendance.channels_of_communication",
+ "value": "[\"SMS\",\"Whatsapp\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:34.328527+00:00",
+ "updatedAt": "2022-09-01T04:14:34.328527+00:00"
+ },
+ {
+ "id": "c02fca84-e558-4244-b04e-5d2905c330a7",
+ "configId": "c02fca84-e558-4244-b04e-5d2905c330a7",
+ "module": "general",
+ "key": "attendance.notification_module",
+ "value": "[\"attendance\",\"worksheet\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:34.329396+00:00",
+ "updatedAt": "2022-09-01T04:14:34.329396+00:00"
+ },
+ {
+ "id": "734d352d-a426-40e5-abe7-bf07f4bc1731",
+ "configId": "734d352d-a426-40e5-abe7-bf07f4bc1731",
+ "module": "theme",
+ "key": "theme.forModules",
+ "value": "\"joyFull\"",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:09.231205+00:00",
+ "updatedAt": "2022-09-21T12:36:49.646489+00:00"
+ },
+ {
+ "id": "3a3aaab4-cb2b-441f-937b-dcce76e7496c",
+ "configId": "3a3aaab4-cb2b-441f-937b-dcce76e7496c",
+ "module": "myprofile",
+ "key": "servicedetails.personalDetailDisplay",
+ "value": "[\"phoneNumber\",\"email\",\"gender\",\"designation\",\"cadre\",\"profQualification\",\"joiningDate\",\"subjectIds\",\"retirementDate\",\"workingStatus\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T03:57:48.235657+00:00",
+ "updatedAt": "2022-09-14T04:07:05.762491+00:00"
+ },
+ {
+ "id": "54f013ce-388e-4dc4-bf46-dd11f4283bd4",
+ "configId": "54f013ce-388e-4dc4-bf46-dd11f4283bd4",
+ "module": "assessment",
+ "key": "spot-assessment.allowSharingSpotAssessmentReport",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.536583+00:00",
+ "updatedAt": "2022-09-19T16:44:40.111635+00:00"
+ },
+ {
+ "id": "bfce8abb-abf1-4fe5-9225-f26e8bbc5874",
+ "configId": "bfce8abb-abf1-4fe5-9225-f26e8bbc5874",
+ "module": "myschool",
+ "key": "schooldetails.schools_fields",
+ "value": "[\"board\",\"district\",\"address\",\"mediumOfInstruction\",\"phoneNumber\",\"headmaster\",\"block\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-12T16:44:33.748953+00:00",
+ "updatedAt": "2022-09-14T19:35:15.979148+00:00"
+ },
+ {
+ "id": "ac3d65ed-6f6e-45d8-b0c6-a2a4249fe2bc",
+ "configId": "ac3d65ed-6f6e-45d8-b0c6-a2a4249fe2bc",
+ "module": "assessment",
+ "key": "spot-assessment.limitOfNumberOfQuestions",
+ "value": "8",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.553227+00:00",
+ "updatedAt": "2022-09-19T16:44:40.097852+00:00"
+ },
+ {
+ "id": "ce60d734-0ac8-47e8-bb9d-7d653162c3fb",
+ "configId": "ce60d734-0ac8-47e8-bb9d-7d653162c3fb",
+ "module": "assessment",
+ "key": "spot-assessment.channelNotificationSpotAssessmentList",
+ "value": "[\"sms\",\"whatsApp\",\"telegram\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.565574+00:00",
+ "updatedAt": "2022-09-19T16:44:40.119217+00:00"
+ },
+ {
+ "id": "24b28775-a3e9-4b9f-bd65-8e995dc72db3",
+ "configId": "24b28775-a3e9-4b9f-bd65-8e995dc72db3",
+ "module": "myprofile",
+ "key": "servicedetails.workhistoryDetailDisplay",
+ "value": "[\"joiningDesignation\",\"leavingDesignation\",\"dateOfJoining\",\"dateOfRelieving\",\"cadre\",\"placeOfPosting\",\"organizationName\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T03:57:48.237157+00:00",
+ "updatedAt": "2022-09-14T04:07:05.762312+00:00"
+ },
+ {
+ "id": "856cc8be-2137-435b-98b8-890261c856b6",
+ "configId": "856cc8be-2137-435b-98b8-890261c856b6",
+ "module": "myschool",
+ "key": "schooldetails.school_adinistrative_details",
+ "value": "[\"student_in_all_categories\",\"teacher_in_all_categories\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-12T16:44:33.749238+00:00",
+ "updatedAt": "2022-09-14T19:35:15.979131+00:00"
+ },
+ {
+ "id": "90d2bf90-ddec-491f-82b8-8d86278381f0",
+ "configId": "90d2bf90-ddec-491f-82b8-8d86278381f0",
+ "module": "assessment",
+ "key": "spot-assessment.allowSendingNotificationSpotAssessment",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.561613+00:00",
+ "updatedAt": "2022-09-19T16:44:40.115348+00:00"
+ },
+ {
+ "id": "f22d8855-cc8a-45b3-8f81-47bb3291d93b",
+ "configId": "f22d8855-cc8a-45b3-8f81-47bb3291d93b",
+ "module": "assessment",
+ "key": "spot-assessment.questionSourceOral",
+ "value": "\"google-read-along\"",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.555525+00:00",
+ "updatedAt": "2022-09-19T16:44:40.114866+00:00"
+ },
+ {
+ "id": "12483453-48ab-46e7-a88b-971278a6e503",
+ "configId": "12483453-48ab-46e7-a88b-971278a6e503",
+ "module": "myprofile",
+ "key": "servicedetails.allow-display-past-workhistory",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T03:57:48.239477+00:00",
+ "updatedAt": "2022-09-14T04:07:05.760488+00:00"
+ },
+ {
+ "id": "c05c4ac4-40e6-4a8e-96d7-d2642d724444",
+ "configId": "c05c4ac4-40e6-4a8e-96d7-d2642d724444",
+ "module": "assessment",
+ "key": "spot-assessment.allowDownloadSpotAssessmentReport",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.555591+00:00",
+ "updatedAt": "2022-09-19T16:44:40.114915+00:00"
+ },
+ {
+ "id": "f748aea1-3c65-47d9-8631-3a917dcc99a8",
+ "configId": "f748aea1-3c65-47d9-8631-3a917dcc99a8",
+ "module": "myvisits",
+ "key": "schooldetails.monthlytargetforschool",
+ "value": "3",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T09:21:33.764168+00:00",
+ "updatedAt": "2022-09-21T10:48:23.314054+00:00"
+ },
+ {
+ "id": "b7440878-c748-4a50-b3fc-e9072901c49f",
+ "configId": "b7440878-c748-4a50-b3fc-e9072901c49f",
+ "module": "myvisits",
+ "key": "schooldetails.school_recommendations_rule",
+ "value": "\"last2months\"",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T09:21:33.764218+00:00",
+ "updatedAt": "2022-09-21T10:48:23.314807+00:00"
+ },
+ {
+ "id": "36d6e27a-3c4c-4558-b94d-58bf0ed95be0",
+ "configId": "36d6e27a-3c4c-4558-b94d-58bf0ed95be0",
+ "module": "worksheet",
+ "key": "worksheet.worksheetTemplate",
+ "value": "[\"with-answers\",\"without-answers\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.382832+00:00",
+ "updatedAt": "2022-10-03T10:46:54.752999+00:00"
+ },
+ {
+ "id": "fb9e5a68-7e38-46ad-a83e-509ce0ac0a92",
+ "configId": "fb9e5a68-7e38-46ad-a83e-509ce0ac0a92",
+ "module": "roles",
+ "key": "roles.mentor",
+ "value": "[\"app\",\"visits\",\"schools\",\"classes\",\"assessment\",\"attendance\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:13:40.32687+00:00",
+ "updatedAt": "2022-10-07T10:18:38.246437+00:00"
+ },
+ {
+ "id": "565ab3e8-f5b9-4ecb-9255-32b5544a48df",
+ "configId": "565ab3e8-f5b9-4ecb-9255-32b5544a48df",
+ "module": "worksheet",
+ "key": "question-bank.questionResource",
+ "value": "[\"diksha\",\"khan-academy\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.389315+00:00",
+ "updatedAt": "2022-10-03T10:46:54.75307+00:00"
+ },
+ {
+ "id": "f02a6fe6-2e65-4e12-96d4-05f00640e70c",
+ "configId": "f02a6fe6-2e65-4e12-96d4-05f00640e70c",
+ "module": "worksheet",
+ "key": "attendance.channels_of_communication",
+ "value": "[\"SMS\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:50.333966+00:00",
+ "updatedAt": "2022-10-03T10:46:54.771693+00:00"
+ },
+ {
+ "id": "5e7944a4-b551-40fe-8799-cd28a880b13a",
+ "configId": "5e7944a4-b551-40fe-8799-cd28a880b13a",
+ "module": "worksheet",
+ "key": "worksheet.configureAutoGenerateWorksheetGetFilter",
+ "value": "[\"gradeLevel\",\"subject\",\"topic\",\"number_of_questions\",\"source\",\"qType\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.39672+00:00",
+ "updatedAt": "2022-10-03T10:46:54.768796+00:00"
+ },
+ {
+ "id": "1a007f3b-d4d5-44da-adfe-ee5c4fdbc1d9",
+ "configId": "1a007f3b-d4d5-44da-adfe-ee5c4fdbc1d9",
+ "module": "worksheet",
+ "key": "question-bank.questionMetadata",
+ "value": "[\"class\",\"subject\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.403575+00:00",
+ "updatedAt": "2022-10-03T10:46:54.769062+00:00"
+ },
+ {
+ "id": "92be5c72-ba75-44ca-87cc-4ad77f2fc94c",
+ "configId": "92be5c72-ba75-44ca-87cc-4ad77f2fc94c",
+ "module": "worksheet",
+ "key": "worksheet.configureWorksheetGetFilter",
+ "value": "[\"source\",\"gradeLevel\",\"subject\",\"topic\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.357724+00:00",
+ "updatedAt": "2022-10-03T10:46:54.761976+00:00"
+ },
+ {
+ "id": "35ae7458-4feb-4f20-8fd6-43f6fe2f83af",
+ "configId": "35ae7458-4feb-4f20-8fd6-43f6fe2f83af",
+ "module": "worksheet",
+ "key": "worksheet.allow-autogenerating-worksheet",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.380714+00:00",
+ "updatedAt": "2022-10-03T10:46:54.774819+00:00"
+ },
+ {
+ "id": "b1d7fbfb-8352-4c27-8781-34517ce6a728",
+ "configId": "b1d7fbfb-8352-4c27-8781-34517ce6a728",
+ "module": "worksheet",
+ "key": "attendance.allowedWorksheetRelatedNotification",
+ "value": "[\"state-deployer\",\"state-admin\",\"teacher\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:50.338429+00:00",
+ "updatedAt": "2022-10-03T10:46:54.784323+00:00"
+ },
+ {
+ "id": "f3718a46-5b3e-4cfa-9eab-62fcfbc61e8f",
+ "configId": "f3718a46-5b3e-4cfa-9eab-62fcfbc61e8f",
+ "module": "worksheet",
+ "key": "worksheet.worksheetMetadata",
+ "value": "[\"grade\",\"subject\",\"topic\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.356935+00:00",
+ "updatedAt": "2022-10-03T10:46:54.787539+00:00"
+ },
+ {
+ "id": "711f8d62-bca0-4ebe-a146-cd98ea370389",
+ "configId": "711f8d62-bca0-4ebe-a146-cd98ea370389",
+ "module": "attendance",
+ "key": "class_attendance.mark_all_attendance_at_once",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:09:38.768869+00:00",
+ "updatedAt": "2022-10-07T06:47:59.499582+00:00"
+ },
+ {
+ "id": "44d35121-2b8f-48be-8ad4-0ab3acb589c1",
+ "configId": "44d35121-2b8f-48be-8ad4-0ab3acb589c1",
+ "module": "attendance",
+ "key": "class_attendance.date_till_previous_attendance_allow",
+ "value": "\"2022-04-01\"",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:09:38.782905+00:00",
+ "updatedAt": "2022-10-07T06:47:59.499921+00:00"
+ },
+ {
+ "id": "e1f5add4-0796-40ee-ac90-42189814e996",
+ "configId": "e1f5add4-0796-40ee-ac90-42189814e996",
+ "module": "attendance",
+ "key": "attendance.order_of_attendance_card",
+ "value": "\"Alphabetically\"",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:09:38.783275+00:00",
+ "updatedAt": "2022-10-07T06:47:59.499551+00:00"
+ },
+ {
+ "id": "7488f991-46d0-4852-967f-90a13ce754ea",
+ "configId": "7488f991-46d0-4852-967f-90a13ce754ea",
+ "module": "attendance",
+ "key": "class_attendance.submit_by",
+ "value": "17",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:09:38.774491+00:00",
+ "updatedAt": "2022-10-07T06:47:59.508722+00:00"
+ },
+ {
+ "id": "f797e123-443c-4ad0-a305-3d82fbeeeb81",
+ "configId": "f797e123-443c-4ad0-a305-3d82fbeeeb81",
+ "module": "attendance",
+ "key": "class_attendance.no_of_day_display_on_attendance_screen",
+ "value": "5",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:09:38.783299+00:00",
+ "updatedAt": "2022-10-07T06:47:59.50861+00:00"
+ },
+ {
+ "id": "e50b3604-4df4-46ed-87ed-e89cc961aa11",
+ "configId": "e50b3604-4df4-46ed-87ed-e89cc961aa11",
+ "module": "attendance",
+ "key": "attendance.default_attendance_states",
+ "value": "[\"Present\",\"Absent\",\"Unmarked\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T11:15:56.439893+00:00",
+ "updatedAt": "2022-10-07T06:47:59.511259+00:00"
+ },
+ {
+ "id": "cf632401-03b1-480c-9647-e383517ddca2",
+ "configId": "cf632401-03b1-480c-9647-e383517ddca2",
+ "module": "assessment",
+ "key": "spot-assessment.dataPoints",
+ "value": "[\"overall-class-participation\",\"100%-achievers\",\"student-wise-assesment\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-02T13:25:41.559954+00:00",
+ "updatedAt": "2022-09-19T16:44:40.116486+00:00"
+ },
+ {
+ "id": "7147fc21-f0f0-48cc-9af6-eb892342f642",
+ "configId": "7147fc21-f0f0-48cc-9af6-eb892342f642",
+ "module": "myvisits",
+ "key": "schooldetails.monthlytargetforteacher",
+ "value": "20",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-14T09:21:33.772487+00:00",
+ "updatedAt": "2022-09-21T10:48:23.314425+00:00"
+ },
+ {
+ "id": "731a5733-d272-4ece-b207-5e5cf94262ab",
+ "configId": "731a5733-d272-4ece-b207-5e5cf94262ab",
+ "module": "roles",
+ "key": "roles.teacher",
+ "value": "[\"mylearning\",\"attendance\",\"assessment\",\"classes\",\"notification\",\"profile\",\"schools\",\"student\",\"calendar\",\"app\",\"visits\",\"hpAssessment\",\"worksheet\",\"issues\",\"cohort\",\"admin\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:13:40.327969+00:00",
+ "updatedAt": "2022-10-07T10:18:38.245672+00:00"
+ },
+ {
+ "id": "62feb3e3-623f-46ab-b55d-7f11ef4d5c62",
+ "configId": "62feb3e3-623f-46ab-b55d-7f11ef4d5c62",
+ "module": "roles",
+ "key": "roles.monitor",
+ "value": "[\"schools\",\"visits\",\"app\",\"assessment\",\"attendance\",\"classes\",\"student\",\"calendar\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:13:40.32763+00:00",
+ "updatedAt": "2022-10-07T10:18:38.246411+00:00"
+ },
+ {
+ "id": "310e7f06-5735-430e-9158-e679ccb589eb",
+ "configId": "310e7f06-5735-430e-9158-e679ccb589eb",
+ "module": "worksheet",
+ "key": "worksheet.allow-download-worksheet",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.384544+00:00",
+ "updatedAt": "2022-10-03T10:46:54.753436+00:00"
+ },
+ {
+ "id": "9a9eb717-b82a-4f51-bded-bdbbbcc6b7ca",
+ "configId": "9a9eb717-b82a-4f51-bded-bdbbbcc6b7ca",
+ "module": "worksheet",
+ "key": "worksheet.configureWorksheetSortOptions",
+ "value": "[\"low-to-high\",\"high-to-low\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.38467+00:00",
+ "updatedAt": "2022-10-03T10:46:54.756809+00:00"
+ },
+ {
+ "id": "0e749423-9c59-48cc-8317-c5ced46d7190",
+ "configId": "0e749423-9c59-48cc-8317-c5ced46d7190",
+ "module": "worksheet",
+ "key": "worksheet.show-correct-answer",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.376176+00:00",
+ "updatedAt": "2022-10-03T10:46:54.764987+00:00"
+ },
+ {
+ "id": "5cc419b5-6d70-4007-a280-12aa7738d5fa",
+ "configId": "5cc419b5-6d70-4007-a280-12aa7738d5fa",
+ "module": "worksheet",
+ "key": "worksheet.allow-sharing-worksheet",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.402028+00:00",
+ "updatedAt": "2022-10-03T10:46:54.758038+00:00"
+ },
+ {
+ "id": "11b5046d-809a-4f4a-bb6d-a43f60b0a470",
+ "configId": "11b5046d-809a-4f4a-bb6d-a43f60b0a470",
+ "module": "worksheet",
+ "key": "worksheet.manage-template",
+ "value": "true",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.38923+00:00",
+ "updatedAt": "2022-10-03T10:46:54.760935+00:00"
+ },
+ {
+ "id": "bfbe15c9-372f-46dc-8775-dde58fc0b18c",
+ "configId": "bfbe15c9-372f-46dc-8775-dde58fc0b18c",
+ "module": "worksheet",
+ "key": "question-bank.configureQuestionGetFilter",
+ "value": "[\"gradeLevel\",\"subject\",\"topic\",\"learning-outcome\",\"source\",\"difficulty-level\",\"level\"]",
+ "context": "",
+ "contextId": "",
+ "canOverride": true,
+ "overrideBy": "",
+ "isPublic": true,
+ "createdAt": "2022-09-01T04:14:45.355548+00:00",
+ "updatedAt": "2022-10-03T10:46:54.770146+00:00"
+ }
+]
diff --git a/packages/common-lib/src/services/attendanceRegistryService.js b/packages/common-lib/src/services/attendanceRegistryService.js
index 73eb0303..dd73849c 100644
--- a/packages/common-lib/src/services/attendanceRegistryService.js
+++ b/packages/common-lib/src/services/attendanceRegistryService.js
@@ -19,7 +19,9 @@ const interfaceData = {
longitude: 'longitude',
image: 'image',
updatedAt: 'updatedAt',
- parentName: 'parentName'
+ parentName: 'parentName',
+ contextId: 'contextId',
+ contextType: 'contextType'
}
let only = Object.keys(interfaceData)
@@ -166,3 +168,26 @@ const addFile = (newData) => {
return newData
}
}
+// search attendendance by filter
+export const searchAttendance = async (data = {}, header = {}) => {
+ let headers = {
+ ...header,
+ Authorization: 'Bearer ' + localStorage.getItem('token')
+ }
+
+ try {
+ const result = await post(
+ process.env.REACT_APP_API_URL + '/attendance/search',
+ data,
+ { headers }
+ )
+ if (result.data) {
+ return result.data
+ } else {
+ return {}
+ }
+ } catch (error) {
+ console.error(error)
+ return {}
+ }
+}
diff --git a/packages/common-lib/src/services/cohortRegistryService.js b/packages/common-lib/src/services/cohortRegistryService.js
index bc92f23d..52f5b6da 100644
--- a/packages/common-lib/src/services/cohortRegistryService.js
+++ b/packages/common-lib/src/services/cohortRegistryService.js
@@ -5,6 +5,7 @@ const interfaceData = {
// id: 'ProgramId',
id: 'cohortId',
// schoolId: 'schoolId',
+ parentId: 'parentId',
type: 'type',
name: 'name',
section: 'section',
@@ -30,10 +31,10 @@ export const getAll = async (params = {}, header = {}) => {
{
limit: '',
page: 0,
- filters: {}
+ filters: {},
+ ...params
},
{
- ...params,
headers
}
)
@@ -55,13 +56,19 @@ export const getCohortDetails = async (params = {}, header = {}) => {
...header,
Authorization: 'Bearer ' + localStorage.getItem('token')
}
- const result = await get(
- `${process.env.REACT_APP_API_URL}/cohort/${params.cohortId}`, {headers}
- )
- if (result.data) {
- return result.data.data;
- } else {
- return [];
+ try {
+ const result = await get(
+ `${process.env.REACT_APP_API_URL}/cohort/${params.cohortId}`,
+ { headers }
+ )
+ if (result.data) {
+ return result.data.data
+ } else {
+ return []
+ }
+ } catch (error) {
+ console.error('Error fetching cohort details:', error)
+ return [] // Handle error by returning empty array or re-throw the error
}
}
@@ -84,19 +91,25 @@ export const getCohortMembers = async (data = {}, header = {}) => {
userId: { _in: memberData.map((e) => e.userId) }
}
}
- let users = await post(`${process.env.REACT_APP_API_URL}/user/search`, body, { headers });
+ let users = await post(
+ `${process.env.REACT_APP_API_URL}/user/search`,
+ body,
+ { headers }
+ )
users = users.data.data
- memberData = memberData.map((memberInfo, index) => {
- const user = users.find((user) => user.userId === memberInfo.userId)
- if (user) {
- return {
- ...memberInfo,
- userDetails: user
+ memberData = memberData
+ .map((memberInfo, index) => {
+ const user = users.find((user) => user.userId === memberInfo.userId)
+ if (user) {
+ return {
+ ...memberInfo,
+ userDetails: user
+ }
}
- }
- return false;
- }).filter(item => !!item.userDetails);
+ return false
+ })
+ .filter((item) => !!item.userDetails)
// const memberDetailsPromises = memberData.map((member) => {
// return post(
// `${process.env.REACT_APP_API_URL}/user/search`,
@@ -122,8 +135,6 @@ export const getCohortMembers = async (data = {}, header = {}) => {
// return memberInfo
// })
-
-
// .map((e) => mapInterfaceData(e, interfaceData))
return memberData
// .sort(function (a, b) {
@@ -141,16 +152,12 @@ export const create = async (data, header = {}) => {
Authorization: 'Bearer ' + localStorage.getItem('token')
}
- const result = await post(
- process.env.REACT_APP_API_URL + '/cohort',
- data,
- {
- headers
- }
- )
+ const result = await post(process.env.REACT_APP_API_URL + '/cohort', data, {
+ headers
+ })
if (result.data) {
- return result.data?.data;
+ return result.data?.data
} else {
return false
}
-}
\ No newline at end of file
+}
diff --git a/packages/profile/src/components/Camera.js b/packages/profile/src/components/Camera.js
index f692d601..a82a799c 100644
--- a/packages/profile/src/components/Camera.js
+++ b/packages/profile/src/components/Camera.js
@@ -69,11 +69,14 @@ export default function Camera({
size: "30px",
}}
onPress={(e) => {
- if (cameraUrl) {
+ setCameraModal(false);
+ // Commented below code because ideal when user click on the close icon button on capture photo modal then setCameraModal should get closed
+ //& all the state regarding this modal should also get cleared
+ /*if (cameraUrl) {
setCameraUrl();
} else {
setCameraModal(false);
- }
+ }*/
}}
/>
diff --git a/packages/profile/src/components/SelfAttendanceSheet.js b/packages/profile/src/components/SelfAttendanceSheet.js
index ccc94076..a6412800 100644
--- a/packages/profile/src/components/SelfAttendanceSheet.js
+++ b/packages/profile/src/components/SelfAttendanceSheet.js
@@ -23,9 +23,9 @@ import {
Stack,
VStack,
} from "native-base";
-import React from "react";
+import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useParams } from "react-router-dom";
import Camera from "./Camera";
import moment from "moment";
@@ -132,6 +132,7 @@ export default function SelfAttendanceSheet({
const [loding, setLoding] = React.useState(false);
const [config, setConfig] = React.useState({});
const [selfAttendance, setSelfAttendance] = React.useState({});
+ const { cohortId } = useParams();
const navigate = useNavigate();
const handleTelemetry = (newAttedance) => {
@@ -172,7 +173,7 @@ export default function SelfAttendanceSheet({
setCameraUrl(image);
let newAttedance = {
...selfAttendance,
- image: image,
+ // image: image,
};
handleMarkAttendance(newAttedance);
} else {
@@ -189,6 +190,8 @@ export default function SelfAttendanceSheet({
id: newAttedance.id,
attendance: newAttedance.attendance,
remark: newAttedance.remark,
+ contextId: cohortId,
+ contextType: "class",
},
{
onlyParameter: [
@@ -206,6 +209,8 @@ export default function SelfAttendanceSheet({
"latitude",
"longitude",
"image",
+ "contextId",
+ "contextType",
],
}
)
@@ -225,6 +230,8 @@ export default function SelfAttendanceSheet({
...newAttedance,
date: moment().format("YYYY-MM-DD"),
studentId: userId || localStorage.getItem("id"),
+ contextId: cohortId,
+ contextType: "class",
};
setSelfAttendance(newAttedance);
attendanceRegistryService
@@ -244,6 +251,8 @@ export default function SelfAttendanceSheet({
"latitude",
"longitude",
"image",
+ "contextId",
+ "contextType",
],
tenantid: process.env.REACT_APP_TENANT_ID,
})
@@ -335,6 +344,7 @@ export default function SelfAttendanceSheet({
setLocationModal(false);
setShowModal(false);
setCameraUrl();
+ window.location.reload();
};
const setAttendanceMark = (e) => {
@@ -438,7 +448,7 @@ export default function SelfAttendanceSheet({
>
{t("CLOSE")}
-
+ */}
)}
@@ -694,7 +704,7 @@ export default function SelfAttendanceSheet({
) : (
-
+ */}
*/}
1) {
+ initials += names[names.length - 1].substring(0, 1).toUpperCase();
+ }
+ return initials;
+ };
const widgetData = [
// {
// title: t("QUICK_CHECK"),
@@ -88,47 +95,47 @@ function Generic({ footerLinks, appName, setAlert }) {
},
_text: { color: "warmGray.700" },
},
- ]
+ ],
},
- // {
- // title: t("ACTIVITY"),
- // subTitle: "1 " + t("REMAINING"),
- // icon: "LightbulbFlashLineIcon",
- // label: "NEW",
- // _box: {
- // bg: "widgetColor.600",
- // },
- // _icon: {
- // color: "iconColor.600",
- // },
- // _text: { color: "warmGray.700" },
- // },
- // {
- // title: t("HOLIDAYS"),
- // subTitle: "2 " + t("THIS_WEEK"),
- // icon: "FootballLineIcon",
- // _box: {
- // bg: "widgetColor.700",
- // },
- // _icon: {
- // color: "iconColor.700",
- // },
- // _text: {
- // color: "warmGray.700",
- // },
- // },
- // {
- // title: t("ATTENDANCE"),
- // subTitle: "12 " + t("REMAINING"),
- // icon: "UserFollowLineIcon",
- // _box: {
- // bg: "widgetColor.800",
- // },
- // _icon: {
- // color: "iconColor.800",
- // },
- // _text: { color: "warmGray.700" },
- // },
+ // {
+ // title: t("ACTIVITY"),
+ // subTitle: "1 " + t("REMAINING"),
+ // icon: "LightbulbFlashLineIcon",
+ // label: "NEW",
+ // _box: {
+ // bg: "widgetColor.600",
+ // },
+ // _icon: {
+ // color: "iconColor.600",
+ // },
+ // _text: { color: "warmGray.700" },
+ // },
+ // {
+ // title: t("HOLIDAYS"),
+ // subTitle: "2 " + t("THIS_WEEK"),
+ // icon: "FootballLineIcon",
+ // _box: {
+ // bg: "widgetColor.700",
+ // },
+ // _icon: {
+ // color: "iconColor.700",
+ // },
+ // _text: {
+ // color: "warmGray.700",
+ // },
+ // },
+ // {
+ // title: t("ATTENDANCE"),
+ // subTitle: "12 " + t("REMAINING"),
+ // icon: "UserFollowLineIcon",
+ // _box: {
+ // bg: "widgetColor.800",
+ // },
+ // _icon: {
+ // color: "iconColor.800",
+ // },
+ // _text: { color: "warmGray.700" },
+ // },
// {
// title: t("THIS_WEEK_TASKS"),
// data: [
@@ -161,11 +168,11 @@ function Generic({ footerLinks, appName, setAlert }) {
];
React.useEffect(() => {
- capture("PAGE");
- if (!localStorage.getItem("howToMarkAttendance")) {
- setPopupModal(true);
- localStorage.setItem("howToMarkAttendance", "true");
- }
+ // capture("PAGE");
+ // if (!localStorage.getItem("howToMarkAttendance")) {
+ // setPopupModal(true);
+ // localStorage.setItem("howToMarkAttendance", "true");
+ // }
}, []);
return (
@@ -193,7 +200,7 @@ function Generic({ footerLinks, appName, setAlert }) {
size="50px"
/>
) : (
- {newAvatar?.toUpperCase().substr(0, 2)}
+ {getInitials(fullName)}
)}
{selfAttendance?.attendance ? (
-
+
- {fullName?.toUpperCase().substr(0, 2)}
+ {getInitials(fullName)}
{fullName}
-
{widgetData.map((item, index) => {
diff --git a/packages/teacher-app/src/pages/MyClasses.js b/packages/teacher-app/src/pages/MyClasses.js
index c6984890..97399d7d 100644
--- a/packages/teacher-app/src/pages/MyClasses.js
+++ b/packages/teacher-app/src/pages/MyClasses.js
@@ -51,6 +51,15 @@ const MyClasses = ({ footerLinks, setAlert, appName }) => {
}
: {};
+ let getInitials = function (string) {
+ let names = string.split(' '), initials = names[0].substring(0, 1).toUpperCase();
+
+ if (names.length > 1) {
+ initials += names[names.length - 1].substring(0, 1).toUpperCase();
+ }
+ return initials;
+ };
+
React.useEffect(() => {
capture("PAGE");
}, []);
@@ -80,8 +89,8 @@ const MyClasses = ({ footerLinks, setAlert, appName }) => {
size="50px"
/>
) : (
- {newAvatar?.toUpperCase().substr(0, 2)}
- )}
+ {getInitials(newAvatar)}
+ )}
{selfAttendance?.attendance ? (
1) {
+ initials += names[names.length - 1].substring(0, 1).toUpperCase();
+ }
+ return initials;
+ };
const widgetData = [
{
@@ -192,7 +200,7 @@ function Home({ footerLinks, appName, setAlert }) {
size="50px"
/>
) : (
- {newAvatar?.toUpperCase().substr(0, 2)}
+ {getInitials(newAvatar)}
)}
{selfAttendance?.attendance ? (