PalisadoesFoundation · tasneemkoushar · Oct 20, 2024 · Oct 20, 2024 · Oct 20, 2024 · Oct 20, 2024
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -84,5 +84,14 @@
   "successfullyUpdated": "Successfully Updated",
   "sessionWarning": "Your session will expire soon due to inactivity. Please interact with the page to extend your session.",
   "sessionLogOut": "Your session has expired due to inactivity. Please log in again to continue.",
-  "sort": "Sort"
+  "sort": "Sort",
+  "all": "All",
+  "active": "Active",
+  "disabled": "Disabled",
+  "pending": "Pending",
+  "completed": "Completed",
+  "late": "Late",
+  "createdLatest": "Created Latest",
+  "createdEarliest": "Created Earliest",
+  "searchBy": "Search by {{item}}"
 }
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -407,9 +407,8 @@
     "assignmentDate": "Assignment Date",
     "active": "Active",
     "clearFilters": "Clear Filters",
-    "completed": "Completed",
     "completionDate": "Completion Date",
-    "createActionItem": "Create Action Items",
+    "createActionItem": "Create Action Item",
     "deleteActionItem": "Delete Action Item",
     "deleteActionItemMsg": "Do you want to remove this action item?",
     "details": "Details",
@@ -767,10 +766,7 @@
     "otherSettings": "Other Settings",
     "changeLanguage": "Change Language",
     "manageCustomFields": "Manage Custom Fields",
-    "pageName": "Settings",
-    "updateYourDetails": "Update Your Details",
-    "updateYourPassword": "Update Your Password",
-    "settings": "Settings"
+    "agendaItemCategories": "Agenda Item Categories"
   },
   "deleteOrg": {
     "deleteOrganization": "Delete Organization",
@@ -1192,7 +1188,7 @@
     "disableButton": "Disable",
     "updateActionItemCategory": "Update",
     "actionItemCategoryName": "Name",
-    "actionItemCategoryDetails": "Action Item Category Details",
+    "categoryDetails": "Category Details",
     "enterName": "Enter Name",
     "successfulCreation": "Action Item Category created successfully",
     "successfulUpdation": "Action Item Category updated successfully",
@@ -1263,7 +1259,7 @@
   },
   "eventActionItems": {
     "title": "Action Items",
-    "createActionItem": "Create Action Items",
+    "createActionItem": "Create Action Item",
     "actionItemCategory": "Action Item Category",
     "selectActionItemCategory": "Select an action item category",
     "selectAssignee": "Select an assignee",

diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json
@@ -84,5 +84,14 @@
   "removedSuccessfully": "{{item}} supprimé avec succès",
   "successfullyUpdated": "Mis à jour avec succès",
   "sessionWarning": "Votre session expirera bientôt en raison de l'inactivité. Veuillez interagir avec la page pour prolonger votre session.",
-  "sessionLogOut": "Votre session a expiré en raison de l'inactivité. Veuillez vous reconnecter pour continuer."
+  "sessionLogOut": "Votre session a expiré en raison de l'inactivité. Veuillez vous reconnecter pour continuer.",
+  "all": "Tous",
+  "active": "Actif",
+  "disabled": "Désactivé",
+  "pending": "En attente",
+  "completed": "Complété",
+  "late": "En retard",
+  "createdLatest": "Créé le plus récemment",
+  "createdEarliest": "Créé le plus tôt",
+  "searchBy": "Rechercher par {{item}}"
 }
diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -407,7 +407,6 @@
     "assignmentDate": "Date d'affectation",
     "active": "Actif",
     "clearFilters": "Effacer les filtres",
-    "completed": "Complété",
     "completionDate": "Date d'achèvement",
     "createActionItem": "Créer un élément d'action",
     "deleteActionItem": "Supprimer l'élément d'action",
@@ -763,14 +762,11 @@
     "actionItemCategories": "Catégories d'éléments d'action",
     "updateOrganization": "Mettre à jour l'organisation",
     "seeRequest": "Voir la demande",
-    "noData": "Pas de données",
-    "otherSettings": "Autres réglages",
+    "noData": "Aucune donnée",
+    "otherSettings": "Autres paramètres",
     "changeLanguage": "Changer de langue",
     "manageCustomFields": "Gérer les champs personnalisés",
-    "pageName": "Paramètres",
-    "updateYourDetails": "Mettre à jour vos détails",
-    "updateYourPassword": "Mettre à jour votre mot de passe",
-    "settings": "Paramètres"
+    "agendaItemCategories": "Catégories d'éléments d'agenda"
   },
   "deleteOrg": {
     "deleteOrganization": "Supprimer l'organisation",
@@ -1192,7 +1188,7 @@
     "disableButton": "Désactiver",
     "updateActionItemCategory": "Mise à jour",
     "actionItemCategoryName": "Nom",
-    "actionItemCategoryDetails": "Détails de la catégorie d'élément d'action",
+    "categoryDetails": "Détails de la catégorie",
     "enterName": "Entrez le nom",
     "successfulCreation": "Catégorie d'élément d'action créée avec succès",
     "successfulUpdation": "Catégorie d'élément d'action mise à jour avec succès",

diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json
@@ -82,7 +82,16 @@
   "addedSuccessfully": "{{item}} सफलतापूर्वक जोड़ा गया",
   "updatedSuccessfully": "{{item}} सफलतापूर्वक अपडेट किया गया",
   "removedSuccessfully": "{{item}} सफलतापूर्वक हटाया गया",
-  "successfullyUpdated": "सफलतापूर्वक अपडेट किया गया",
   "sessionWarning": "आपका सत्र निष्क्रियता के कारण जल्द ही समाप्त हो जाएगा। कृपया अपने सत्र को बढ़ाने के लिए पृष्ठ के साथ बातचीत करें।",
-  "sessionLogOut": "निष्क्रियता के कारण आपका सत्र समाप्त हो गया है। कृपया जारी रखने के लिए पुनः लॉगिन करें।"
+  "sessionLogOut": "निष्क्रियता के कारण आपका सत्र समाप्त हो गया है। कृपया जारी रखने के लिए पुनः लॉगिन करें।",
+  "successfullyUpdated": "सफलतापूर्वक अपडेट किया गया",
+  "all": "सभी",
+  "active": "सक्रिय",
+  "disabled": "अक्षम",
+  "pending": "लंबित",
+  "completed": "पूरा हुआ",
+  "late": "देर से",
+  "createdLatest": "नवीनतम बनाया गया",
+  "createdEarliest": "सबसे पहले बनाया गया",
+  "searchBy": "के द्वारा खोजें {{item}}"
 }
diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -407,7 +407,6 @@
     "assignmentDate": "असाइनमेंट दिनांक",
     "active": "सक्रिय",
     "clearFilters": "फ़िल्टर साफ़ करें",
-    "completed": "पुरा होना।",
     "completionDate": "पूरा करने की तिथि",
     "createActionItem": "कार्रवाई आइटम बनाएं",
     "deleteActionItem": "क्रिया आइटम हटाएँ",
@@ -758,19 +757,16 @@
     "amount": "मात्रा"
   },
   "orgSettings": {
-    "title": "समायोजन",
+    "title": "सेटिंग्स",
     "general": "सामान्य",
-    "actionItemCategories": "कार्रवाई आइटम श्रेणियाँ",
-    "updateOrganization": "संगठन अद्यतन करें",
+    "actionItemCategories": "कार्य आइटम श्रेणियाँ",
+    "updateOrganization": "संगठन अपडेट करें",
     "seeRequest": "अनुरोध देखें",
     "noData": "कोई डेटा नहीं",
-    "otherSettings": "अन्य सेटिंग",
+    "otherSettings": "अन्य सेटिंग्स",
     "changeLanguage": "भाषा बदलें",
     "manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें",
-    "pageName": "सेटिंग्स",
-    "updateYourDetails": "अपनी जानकारी अपडेट करें",
-    "updateYourPassword": "अपना पासवर्ड अपडेट करें",
-    "settings": "सेटिंग्स"
+    "agendaItemCategories": "एजेंडा आइटम श्रेणियाँ"
   },
   "deleteOrg": {
     "deleteOrganization": "संगठन हटाएँ",
@@ -1192,7 +1188,7 @@
     "disableButton": "अक्षम करना",
     "updateActionItemCategory": "अद्यतन",
     "actionItemCategoryName": "नाम",
-    "actionItemCategoryDetails": "कार्य आइटम श्रेणी विवरण",
+    "categoryDetails": "श्रेणी विवरण",
     "enterName": "नाम दर्ज करें",
     "successfulCreation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक बनाई गई",
     "successfulUpdation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक अपडेट की गई",

diff --git a/public/locales/sp/common.json b/public/locales/sp/common.json
@@ -84,5 +84,14 @@
   "removedSuccessfully": "{{item}} eliminado con éxito",
   "successfullyUpdated": "Actualizado con éxito",
   "sessionWarning": "Su sesión expirará pronto debido a la inactividad. Por favor, interactúe con la página para extender su sesión.",
-  "sessionLogOut": "Su sesión ha expirado debido a la inactividad. Por favor, inicie sesión nuevamente para continuar."
+  "sessionLogOut": "Su sesión ha expirado debido a la inactividad. Por favor, inicie sesión nuevamente para continuar.",
+  "all": "Todos",
+  "active": "Activo",
+  "disabled": "Deshabilitado",
+  "pending": "Pendiente",
+  "completed": "Completado",
+  "late": "Tarde",
+  "createdLatest": "Creado más reciente",
+  "createdEarliest": "Creado más temprano",
+  "searchBy": "Buscar por {{item}}"
 }
diff --git a/public/locales/sp/translation.json b/public/locales/sp/translation.json
@@ -410,7 +410,6 @@
     "active": "Activo",
     "clearFilters": "Borrar filtros",
     "close": "Cerrar",
-    "completed": "Completado",
     "completionDate": "Fecha de finalización",
     "createActionItem": "Crear ítem de acción",
     "deleteActionItem": "Eliminar ítem de acción",
@@ -759,19 +758,16 @@
     "amount": "Monto"
   },
   "orgSettings": {
-    "title": "Configuración Talawa",
-    "pageName": "Configuración",
+    "title": "Configuración",
     "general": "General",
     "actionItemCategories": "Categorías de elementos de acción",
-    "updateYourDetails": "Actualiza tus datos",
-    "updateYourPassword": "Actualice su contraseña",
-    "updateOrganization": "Actualizar Organización",
-    "seeRequest": "Ver Solicitud",
-    "settings": "Ajustes",
+    "updateOrganization": "Actualizar organización",
+    "seeRequest": "Ver solicitud",
     "noData": "Sin datos",
-    "otherSettings": "Otras Configuraciones",
-    "changeLanguage": "Cambiar Idioma",
-    "manageCustomFields": "Gestionar Campos Personalizados"
+    "otherSettings": "Otras configuraciones",
+    "changeLanguage": "Cambiar idioma",
+    "manageCustomFields": "Administrar campos personalizados",
+    "agendaItemCategories": "Categorías de elementos de agenda"
   },
   "deleteOrg": {
     "deleteOrganization": "Eliminar organización",
@@ -1195,7 +1191,7 @@
     "disableButton": "Inhabilitar",
     "updateActionItemCategory": "Actualizar",
     "actionItemCategoryName": "Nombre",
-    "actionItemCategoryDetails": "Detalles de la categoría de elemento de acción",
+    "categoryDetails": "Detalles de la categoría",
     "enterName": "Introduzca el nombre",
     "successfulCreation": "Categoría de elemento de acción creada correctamente",
     "successfulUpdation": "Categoría de elemento de acción actualizada correctamente",
@@ -1204,7 +1200,7 @@
     "categoryDisabled": "Categoría de elemento de acción deshabilitada",
     "noActionItemCategories": "No hay categorías de elementos de acción",
     "status": "Estado",
-    "categoryDeleted": "Categoría de elemento de acción eliminada",
+    "categoryDeleted": "Categoría de elemento de acción eliminada con éxito",
     "deleteCategory": "Eliminar categoría",
     "deleteCategoryMsg": "¿Está seguro de que desea eliminar esta categoría de elemento de acción?"
   },

diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json
@@ -84,5 +84,14 @@
   "removedSuccessfully": "{{item}} 删除成功",
   "successfullyUpdated": "更新成功",
   "sessionWarning": "由于不活动，您的会话即将过期。请与页面互动以延长您的会话。",
-  "sessionLogOut": "由于不活动，您的会话已过期。请重新登录以继续。"
+  "sessionLogOut": "由于不活动，您的会话已过期。请重新登录以继续。",
+  "all": "全部",
+  "active": "活跃",
+  "disabled": "禁用",
+  "pending": "待处理",
+  "completed": "已完成",
+  "late": "迟到",
+  "createdLatest": "最近创建",
+  "createdEarliest": "最早创建",
+  "searchBy": "搜索依据 {{item}}"
 }
diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -407,7 +407,6 @@
     "assignmentDate": "分配日期",
     "active": "积极的",
     "clearFilters": "清除过滤器",
-    "completed": "完全的",
     "completionDate": "完成日期",
     "createActionItem": "创建操作项",
     "deleteActionItem": "删除操作项",
@@ -767,10 +766,7 @@
     "otherSettings": "其他设置",
     "changeLanguage": "改变语言",
     "manageCustomFields": "管理自定义字段",
-    "pageName": "设置",
-    "updateYourDetails": "更新您的详细信息",
-    "updateYourPassword": "更新您的密码",
-    "settings": "设置"
+    "agendaItemCategories": "议程项目类别"
   },
   "deleteOrg": {
     "deleteOrganization": "删除组织",
@@ -1192,7 +1188,7 @@
     "disableButton": "禁用",
     "updateActionItemCategory": "更新",
     "actionItemCategoryName": "姓名",
-    "actionItemCategoryDetails": "行动项目类别详细信息",
+    "categoryDetails": "类别详情",
     "enterName": "输入名字",
     "successfulCreation": "操作项类别创建成功",
     "successfulUpdation": "行动项目类别已成功更新",

diff --git a/src/App.tsx b/src/App.tsx
@@ -14,7 +14,6 @@ import OrgList from 'screens/OrgList/OrgList';
 import OrgPost from 'screens/OrgPost/OrgPost';
 import OrgSettings from 'screens/OrgSettings/OrgSettings';
 import OrganizationActionItems from 'screens/OrganizationActionItems/OrganizationActionItems';
-import OrganizationAgendaCategory from 'screens/OrganizationAgendaCategory/OrganizationAgendaCategory';
 import OrganizationDashboard from 'screens/OrganizationDashboard/OrganizationDashboard';
 import OrganizationEvents from 'screens/OrganizationEvents/OrganizationEvents';
 import OrganizaitionFundCampiagn from 'screens/OrganizationFundCampaign/OrganizationFundCampagins';
@@ -37,7 +36,6 @@ import Posts from 'screens/UserPortal/Posts/Posts';
 import Organizations from 'screens/UserPortal/Organizations/Organizations';
 import People from 'screens/UserPortal/People/People';
 import Settings from 'screens/UserPortal/Settings/Settings';
-// import UserLoginPage from 'screens/UserPortal/UserLoginPage/UserLoginPage';
 import Chat from 'screens/UserPortal/Chat/Chat';
 import { useQuery } from '@apollo/client';
 import { CHECK_AUTH } from 'GraphQl/Queries/Queries';
@@ -164,10 +162,6 @@ function app(): JSX.Element {
               path="/orgactionitems/:orgId"
               element={<OrganizationActionItems />}
             />
-            <Route
-              path="/orgagendacategory/:orgId"
-              element={<OrganizationAgendaCategory />}
-            />
             <Route path="/orgfunds/:orgId" element={<OrganizationFunds />} />
             <Route
               path="/orgfundcampaign/:orgId/:fundId"

diff --git a/src/GraphQl/Mutations/ActionItemCategoryMutations.ts b/src/GraphQl/Mutations/ActionItemCategoryMutations.ts
@@ -4,18 +4,19 @@ import gql from 'graphql-tag';
  * GraphQL mutation to create an action item category.
  *
  * @param name - Name of the ActionItemCategory.
+ * @param isDisabled - Disabled status of the ActionItemCategory.
  * @param organizationId - Organization to which the ActionItemCategory belongs.
  */
 
 export const CREATE_ACTION_ITEM_CATEGORY_MUTATION = gql`
   mutation CreateActionItemCategory(
-    $isDisabled: Boolean!
     $name: String!
+    $isDisabled: Boolean!
     $organizationId: ID!
   ) {
     createActionItemCategory(
-      isDisabled: $isDisabled
       name: $name
+      isDisabled: $isDisabled
       organizationId: $organizationId
     ) {
       _id

diff --git a/src/GraphQl/Mutations/ActionItemMutations.ts b/src/GraphQl/Mutations/ActionItemMutations.ts
@@ -8,6 +8,7 @@ import gql from 'graphql-tag';
  * @param preCompletionNotes - Notes prior to completion.
  * @param dueDate - Due date.
  * @param eventId - Event to which the ActionItem is related.
+ * @param allotedHours - Hours alloted for the ActionItem.
  */
 
 export const CREATE_ACTION_ITEM_MUTATION = gql`
@@ -17,6 +18,7 @@ export const CREATE_ACTION_ITEM_MUTATION = gql`
     $preCompletionNotes: String
     $dueDate: Date
     $eventId: ID
+    $allotedHours: Float
   ) {
     createActionItem(
       actionItemCategoryId: $actionItemCategoryId
@@ -25,6 +27,7 @@ export const CREATE_ACTION_ITEM_MUTATION = gql`
         preCompletionNotes: $preCompletionNotes
         dueDate: $dueDate
         eventId: $eventId
+        allotedHours: $allotedHours
       }
     ) {
       _id
@@ -53,6 +56,7 @@ export const UPDATE_ACTION_ITEM_MUTATION = gql`
     $dueDate: Date
     $completionDate: Date
     $isCompleted: Boolean
+    $allotedHours: Float
   ) {
     updateActionItem(
       id: $actionItemId
@@ -62,6 +66,7 @@ export const UPDATE_ACTION_ITEM_MUTATION = gql`
         postCompletionNotes: $postCompletionNotes
         dueDate: $dueDate
         completionDate: $completionDate
+        allotedHours: $allotedHours
         isCompleted: $isCompleted
       }
     ) {

diff --git a/src/GraphQl/Queries/ActionItemCategoryQueries.ts b/src/GraphQl/Queries/ActionItemCategoryQueries.ts
@@ -8,11 +8,25 @@ import gql from 'graphql-tag';
  */
 
 export const ACTION_ITEM_CATEGORY_LIST = gql`
-  query ActionItemCategoriesByOrganization($organizationId: ID!) {
-    actionItemCategoriesByOrganization(organizationId: $organizationId) {
+  query ActionItemCategoriesByOrganization(
+    $organizationId: ID!
+    $where: ActionItemCategoryWhereInput
+    $orderBy: ActionItemsOrderByInput
+  ) {
+    actionItemCategoriesByOrganization(
+      organizationId: $organizationId
+      where: $where
+      orderBy: $orderBy
+    ) {
       _id
       name
       isDisabled
+      createdAt
+      creator {
+        _id
+        firstName
+        lastName
+      }
     }
   }
 `;