Skip to content

Commit

Permalink
Redesign Action Items & ActionCategories, Shift AgendaCategory to Set…
Browse files Browse the repository at this point in the history
…tings & Fix LeftDrawer Scroll (#2231)

* Add scroll & fix org Avatar getting stretched in left drawer

* Refac & restruct OrgSettings

* Refac ActionItem Category & Add support for delete, Search, Sort & Filter

* Refac & Redesign Global Action Items

* Moved AgendaCategories to Settings & removed Delete for action categories

* Redesigned Event Dashboard Parent container

* Add new Event Action Screen & Delete old screens

* Tests for OrgSettings, IconComponent, LeftDrawerOrg, routesReducer

* Add test for Action Item Category

* Add tests for OrganizationActionItems & related Modals

* item modal test updation

* Add tsdoc comments

* Add CodeRabbit Suggestion for code Refac

* fix tests
  • Loading branch information
GlenDsza authored Sep 7, 2024
1 parent fbce25b commit 190e5e3
Show file tree
Hide file tree
Showing 109 changed files with 5,545 additions and 8,729 deletions.
11 changes: 10 additions & 1 deletion public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,14 @@
"updatedSuccessfully": "{{item}} updated Successfully",
"removedSuccessfully": "{{item}} removed Successfully",
"successfullyUpdated": "Successfully Updated",
"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}}"
}
24 changes: 18 additions & 6 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,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",
Expand All @@ -308,7 +307,14 @@
"successfulCreation": "Action Item created successfully",
"successfulUpdation": "Action Item updated successfully",
"successfulDeletion": "Action Item deleted successfully",
"title": "Action Items"
"title": "Action Items",
"category": "Category",
"allotedHours": "Alloted Hours",
"latestDueDate": "Latest Due Date",
"earliestDueDate": "Earliest Due Date",
"updateActionItem": "Update Action Item",
"noneUpdated": "None of the fields were updated",
"updateStatusMsg": "Are you sure you want to mark this action item as pending?"
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "Agenda Category Details",
Expand Down Expand Up @@ -601,7 +607,8 @@
"noData": "No data",
"otherSettings": "Other Settings",
"changeLanguage": "Change Language",
"manageCustomFields": "Manage Custom Fields"
"manageCustomFields": "Manage Custom Fields",
"agendaItemCategories": "Agenda Item Categories"
},
"deleteOrg": {
"deleteOrganization": "Delete Organization",
Expand Down Expand Up @@ -937,13 +944,18 @@
"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",
"sameNameConflict": "Please change the name to make an update",
"categoryEnabled": "Action Item Category Enabled",
"categoryDisabled": "Action Item Category Disabled"
"categoryDisabled": "Action Item Category Disabled",
"noActionItemCategories": "No Action Item Categories",
"status": "Status",
"categoryDeleted": "Action Item Category deleted successfully",
"deleteCategory": "Delete Category",
"deleteCategoryMsg": "Are you sure you want to delete this Action Item Category?"
},
"organizationVenues": {
"title": "Venues",
Expand Down
11 changes: 10 additions & 1 deletion public/locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,14 @@
"addedSuccessfully": "{{item}} ajouté avec succès",
"updatedSuccessfully": "{{item}} mis à jour avec succès",
"removedSuccessfully": "{{item}} supprimé avec succès",
"successfullyUpdated": "Mis à jour avec succès"
"successfullyUpdated": "Mis à jour avec succès",
"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}}"
}
26 changes: 19 additions & 7 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,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",
Expand All @@ -311,7 +310,14 @@
"successfulCreation": "Élément d'action créé avec succès",
"successfulUpdation": "Élément d'action mis à jour avec succès",
"successfulDeletion": "Élément d'action supprimé avec succès",
"title": "Éléments d'action"
"title": "Éléments d'action",
"category": "Catégorie",
"allotedHours": "Heures allouées",
"latestDueDate": "Date d'échéance la plus récente",
"earliestDueDate": "Date d'échéance la plus ancienne",
"updateActionItem": "Mettre à jour l'élément d'action",
"noneUpdated": "Aucun des champs n'a été mis à jour",
"updateStatusMsg": "Êtes-vous sûr de vouloir marquer cet élément d'action comme en attente?"
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "Détails de la catégorie d'ordre du jour",
Expand Down Expand Up @@ -604,10 +610,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"
"manageCustomFields": "Gérer les champs personnalisés",
"agendaItemCategories": "Catégories d'éléments d'agenda"
},
"deleteOrg": {
"deleteOrganization": "Supprimer l'organisation",
Expand Down Expand Up @@ -938,13 +945,18 @@
"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",
"sameNameConflict": "Veuillez changer le nom pour effectuer une mise à jour",
"categoryEnabled": "Catégorie d'élément d'action activée",
"categoryDisabled": "Catégorie d'élément d'action désactivée"
"categoryDisabled": "Catégorie d'élément d'action désactivée",
"noActionItemCategories": "Aucune catégorie d'élément d'action",
"status": "Statut",
"categoryDeleted": "Catégorie d'élément d'action supprimée avec succès",
"deleteCategory": "Supprimer la catégorie",
"deleteCategoryMsg": "Êtes-vous sûr de vouloir supprimer cette catégorie d'élément d'action ?"
},
"organizationVenues": {
"title": "Lieux",
Expand Down
11 changes: 10 additions & 1 deletion public/locales/hi/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,14 @@
"addedSuccessfully": "{{item}} सफलतापूर्वक जोड़ा गया",
"updatedSuccessfully": "{{item}} सफलतापूर्वक अपडेट किया गया",
"removedSuccessfully": "{{item}} सफलतापूर्वक हटाया गया",
"successfullyUpdated": "सफलतापूर्वक अपडेट किया गया"
"successfullyUpdated": "सफलतापूर्वक अपडेट किया गया",
"all": "सभी",
"active": "सक्रिय",
"disabled": "अक्षम",
"pending": "लंबित",
"completed": "पूरा हुआ",
"late": "देर से",
"createdLatest": "नवीनतम बनाया गया",
"createdEarliest": "सबसे पहले बनाया गया",
"searchBy": "के द्वारा खोजें {{item}}"
}
30 changes: 21 additions & 9 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@
"assignmentDate": "असाइनमेंट दिनांक",
"active": "सक्रिय",
"clearFilters": "फ़िल्टर साफ़ करें",
"completed": "पुरा होना।",
"completionDate": "पूरा करने की तिथि",
"createActionItem": "कार्रवाई आइटम बनाएं",
"deleteActionItem": "क्रिया आइटम हटाएँ",
Expand All @@ -311,7 +310,14 @@
"successfulCreation": "कार्रवाई आइटम सफलतापूर्वक बनाया गया",
"successfulUpdation": "कार्रवाई आइटम सफलतापूर्वक अपडेट किया गया",
"successfulDeletion": "कार्रवाई आइटम सफलतापूर्वक हटा दिया गया",
"title": "एक्शन आइटम्स"
"title": "एक्शन आइटम्स",
"category": "श्रेणी",
"allotedHours": "आवंटित घंटे",
"latestDueDate": "सबसे अधिक नियत तिथि",
"earliestDueDate": "सबसे पहले की नियत तिथि",
"updateActionItem": "कार्य आइटम अपडेट करें",
"noneUpdated": "कोई फ़ील्ड अपडेट नहीं किया गया",
"updateStatusMsg": "क्या आप वाकई इस कार्य आइटम को लंबित के रूप में चिह्नित करना चाहते हैं?"
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "एजेंडा श्रेणी विवरण",
Expand Down Expand Up @@ -599,15 +605,16 @@
"amount": "मात्रा"
},
"orgSettings": {
"title": "समायोजन",
"title": "सेटिंग्स",
"general": "सामान्य",
"actionItemCategories": "कार्रवाई आइटम श्रेणियाँ",
"updateOrganization": "संगठन अद्यतन करें",
"actionItemCategories": "कार्य आइटम श्रेणियाँ",
"updateOrganization": "संगठन अपडेट करें",
"seeRequest": "अनुरोध देखें",
"noData": "कोई डेटा नहीं",
"otherSettings": "अन्य सेटिंग",
"otherSettings": "अन्य सेटिंग्स",
"changeLanguage": "भाषा बदलें",
"manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें"
"manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें",
"agendaItemCategories": "एजेंडा आइटम श्रेणियाँ"
},
"deleteOrg": {
"deleteOrganization": "संगठन हटाएँ",
Expand Down Expand Up @@ -938,13 +945,18 @@
"disableButton": "अक्षम करना",
"updateActionItemCategory": "अद्यतन",
"actionItemCategoryName": "नाम",
"actionItemCategoryDetails": "कार्य आइटम श्रेणी विवरण",
"categoryDetails": "श्रेणी विवरण",
"enterName": "नाम दर्ज करें",
"successfulCreation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक बनाई गई",
"successfulUpdation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक अपडेट की गई",
"sameNameConflict": "अपडेट करने के लिए कृपया नाम बदलें",
"categoryEnabled": "कार्य आइटम श्रेणी सक्षम",
"categoryDisabled": "कार्रवाई आइटम श्रेणी अक्षम"
"categoryDisabled": "कार्रवाई आइटम श्रेणी अक्षम",
"noActionItemCategories": "कोई कार्रवाई आइटम श्रेणी नहीं",
"status": "स्थिति",
"categoryDeleted": "कार्रवाई आइटम श्रेणी सफलतापूर्वक हटा दी गई",
"deleteCategory": "श्रेणी हटाएं",
"deleteCategoryMsg": "क्या आप वाकई इस कार्रवाई आइटम श्रेणी को हटाना चाहते हैं?"
},
"organizationVenues": {
"title": "स्थानों",
Expand Down
11 changes: 10 additions & 1 deletion public/locales/sp/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,14 @@
"addedSuccessfully": "{{item}} agregado con éxito",
"updatedSuccessfully": "{{item}} actualizado con éxito",
"removedSuccessfully": "{{item}} eliminado con éxito",
"successfullyUpdated": "Actualizado con éxito"
"successfullyUpdated": "Actualizado con éxito",
"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}}"
}
36 changes: 22 additions & 14 deletions public/locales/sp/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,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",
Expand All @@ -426,7 +425,14 @@
"successfulUpdation": "Ítem de acción actualizado con éxito",
"successfulDeletion": "Ítem de acción eliminado con éxito",
"title": "Ítems de acción",
"yes": ""
"yes": "",
"category": "Categoría",
"allotedHours": "Horas asignadas",
"latestDueDate": "Fecha de vencimiento más reciente",
"earliestDueDate": "Fecha de vencimiento más antigua",
"updateActionItem": "Actualizar elemento de acción",
"noneUpdated": "Ninguno de los campos se actualizó",
"updateStatusMsg": "¿Está seguro de que desea marcar este elemento de acción como pendiente?"
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "Detalles de la categoría de la agenda",
Expand Down Expand Up @@ -741,19 +747,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",
Expand Down Expand Up @@ -1159,13 +1162,18 @@
"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",
"sameNameConflict": "Cambie el nombre para realizar una actualización",
"categoryEnabled": "Categoría de elemento de acción habilitada",
"categoryDisabled": "Categoría de elemento de acción deshabilitada"
"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 con éxito",
"deleteCategory": "Eliminar categoría",
"deleteCategoryMsg": "¿Está seguro de que desea eliminar esta categoría de elemento de acción?"
},
"organizationVenues": {
"title": "Lugares",
Expand Down
11 changes: 10 additions & 1 deletion public/locales/zh/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,14 @@
"addedSuccessfully": "{{item}} 添加成功",
"updatedSuccessfully": "{{item}} 更新成功",
"removedSuccessfully": "{{item}} 删除成功",
"successfullyUpdated": "更新成功"
"successfullyUpdated": "更新成功",
"all": "全部",
"active": "活跃",
"disabled": "禁用",
"pending": "待处理",
"completed": "已完成",
"late": "迟到",
"createdLatest": "最近创建",
"createdEarliest": "最早创建",
"searchBy": "搜索依据 {{item}}"
}
Loading

0 comments on commit 190e5e3

Please sign in to comment.