Skip to content

Commit

Permalink
ADMIN REDESIGN: redesign the Event Management's Action Items tab for …
Browse files Browse the repository at this point in the history
…the talawa Admin portal (PalisadoesFoundation#1895)

* redesign action items and added tests

* added missing files

* added missing files

* added missing files

* Correct changed files

* fixed spelling mistake

* udated delete modal and added tests

* fixed linting errors

* tests

* fixed linting

* Changed headings and added notes field

* fixed linting
  • Loading branch information
Anvita0305 authored Apr 12, 2024
1 parent 2895a12 commit 2c36281
Show file tree
Hide file tree
Showing 10 changed files with 1,547 additions and 1 deletion.
22 changes: 22 additions & 0 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1060,5 +1060,27 @@
"passwordNotMatch": "Passwords do not match.",
"user": "User",
"addMember": "Add Member"
},
"eventActionItems": {
"title": "Action Items",
"createActionItem": "Create Action Items",
"actionItemCategory": "Action Item Category",
"selectActionItemCategory": "Select an action item category",
"selectAssignee": "Select an assignee",
"preCompletionNotes": "Pre Completion Notes",
"postCompletionNotes": "Post Completion Notes",
"actionItemDetails": "Action Item Details",
"dueDate": "Due Date",
"completionDate": "Completion Date",
"editActionItem": "Edit Action Item",
"deleteActionItem": "Delete Action Item",
"deleteActionItemMsg": "Do you want to remove this action item?",
"yes": "Yes",
"no": "No",
"successfulDeletion": "Action Item deleted successfully",
"successfulCreation": "Action Item created successfully",
"successfulUpdation": "Action Item updated successfully",
"notes": "Notes",
"save": "Save"
}
}
22 changes: 22 additions & 0 deletions public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1049,5 +1049,27 @@
"passwordNotMatch": "Les mots de passe ne correspondent pas.",
"user": "Utilisateur",
"addMember": "Ajouter un membre"
},
"eventActionItems": {
"title": "Éléments d'action",
"createActionItem": "Créer des éléments d'action",
"actionItemCategory": "Catégorie d'éléments d'action",
"selectActionItemCategory": "Sélectionnez une catégorie d'élément d'action",
"selectAssignee": "Sélectionner un cessionnaire",
"preCompletionNotes": "Notes de pré-achèvement",
"postCompletionNotes": "Notes post-achèvement",
"actionItemDetails": "Détails de l'élément d'action",
"dueDate": "Date d'échéance",
"completetionDate": "Date d'achèvement",
"editActionItem": "Modifier l'élément d'action",
"deleteActionItem": "Supprimer l'élément d'action",
"deleteActionItemMsg": "Voulez-vous supprimer cette action ?",
"yes": "Oui",
"no": "non",
"successfulDeletion": "Élément d'action supprimé avec succès",
"successfulCreation": "Élément d'action créé avec succès",
"successfulUpdation": "Élément d'action mis à jour avec succès",
"notes": "Remarques",
"save": "Enregistrer"
}
}
22 changes: 22 additions & 0 deletions public/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1054,5 +1054,27 @@
"passwordNotMatch": "पासवर्ड मेल नहीं खाते।",
"user": "उपयोगकर्ता",
"addMember": "सदस्य जोड़ें"
},
"eventActionItems": {
"title": "कार्रवाई आइटम",
"createActionItem": "क्रिया आइटम बनाएँ",
"actionItemCategory": "एक्शन आइटम श्रेणी",
"selectActionItemCategory": "एक क्रिया आइटम श्रेणी चुनें",
"selectAssignee": "एक असाइनी का चयन करें",
"preCompletionNotes": "पूर्व समापन नोट्स",
"postCompletionNotes": "पोस्टकंप्लीशननोट्स",
"actionItemDetails": "एक्शन आइटम विवरण",
"dueDate": "नियत तिथि",
"completionDate": "समापन तिथि",
"editActionItem": "एक्शन आइटम संपादित करें",
"deleteActionItem": "क्रिया आइटम हटाएं",
"deleteActionItemMsg": "क्या आप इस क्रिया आइटम को हटाना चाहते हैं?",
"yes": "हां",
"no": "नहीं",
"successfulDeletion": "कार्रवाई आइटम सफलतापूर्वक हटा दिया गया",
"successfulCreation": "क्रिया आइटम सफलतापूर्वक बनाया गया",
"successfulUpdation": "कार्रवाई आइटम सफलतापूर्वक अद्यतन किया गया",
"notes": "नोट्स",
"save": "सहेजें"
}
}
22 changes: 22 additions & 0 deletions public/locales/sp.json
Original file line number Diff line number Diff line change
Expand Up @@ -1051,5 +1051,27 @@
"passwordNotMatch": "Las contraseñas no coinciden.",
"user": "Usuario",
"addMember": "Agregar miembro"
},
"eventActionItems": {
"title": "Elementos de acción",
"createActionItem": "Crear elementos de acción",
"actionItemCategory": "Categoría de elemento de acción",
"selectActionItemCategory": "Seleccione una categoría de elemento de acción",
"selectAssignee": "Seleccione un asignado",
"preCompletionNotes": "Notas previas a la finalización",
"postCompletionNotes": "Publicar notas de finalización",
"actionItemDetails": "Detalles del elemento de acción",
"dueDate": "Fecha de vencimiento",
"completionDate": "Fecha de finalización",
"editActionItem": "Editar elemento de acción",
"deleteActionItem": "Eliminar elemento de acción",
"deleteActionItemMsg": "¿Quieres eliminar este elemento de acción?",
"yes": "",
"no": "no",
"successfulDeletion": "Elemento de acción eliminado exitosamente",
"successfulCreation": "Elemento de acción creado exitosamente",
"successfulUpdation": "Elemento de acción actualizado correctamente",
"notes": "Notas",
"save": "Guardar"
}
}
22 changes: 22 additions & 0 deletions public/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1052,5 +1052,27 @@
"passwordNotMatch": "密码不匹配。",
"user": "用户",
"addMember": "添加成员"
},
"eventActionItems": {
"title": "行动项目",
"createActionItem": "创建操作项",
"actionItemCategory": "操作项类别",
"selectActionItemCategory": "选择操作项类别",
"selectAssignee": "选择受让人",
"preCompletionNotes": "预完成注释",
"postCompletionNotes": "完成后注释",
"actionItemDetails": "操作项详细信息",
"dueDate": "截止日期",
"completionDate": "完成日期",
"editActionItem": "编辑操作项",
"deleteActionItem": "删除操作项",
"deleteActionItemMsg": "您要删除此操作项吗?",
"yes": "是的",
"不": "",
"successfulDeletion": "操作项删除成功",
"successfulCreation": "操作项创建成功",
"successfulUpdation": "操作项更新成功",
"notes": "注释",
"save": "保存"
}
}
37 changes: 37 additions & 0 deletions src/GraphQl/Queries/ActionItemQueries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,40 @@ export const ACTION_ITEM_LIST = gql`
}
}
`;

export const ACTION_ITEM_LIST_BY_EVENTS = gql`
query actionItemsByEvent($eventId: ID!) {
actionItemsByEvent(eventId: $eventId) {
_id
assignee {
_id
firstName
lastName
}
assigner {
_id
firstName
lastName
}
actionItemCategory {
_id
name
}
preCompletionNotes
postCompletionNotes
assignmentDate
dueDate
completionDate
isCompleted
event {
_id
title
}
creator {
_id
firstName
lastName
}
}
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
@media screen and (max-width: 575.5px) {
.mainpageright {
width: 98%;
}
}
.modalContent {
width: 670px;
max-width: 680px;
}
.dropdown {
background-color: white;
border: 1px solid #31bb6b;
position: relative;
display: inline-block;
margin-top: 10px;
margin-bottom: 10px;
color: #31bb6b;
}
.input {
flex: 1;
position: relative;
}

.btnsContainer {
display: flex;
margin: 2.5rem 0 2.5rem 0;
}

.btnsContainer .btnsBlock {
display: flex;
}

.btnsContainer .btnsBlock button {
margin-left: 1rem;
display: flex;
justify-content: center;
align-items: center;
}

.btnsContainer .input {
flex: 1;
position: relative;
}

input {
outline: 1px solid var(--bs-gray-400);
}

.btnsContainer .input button {
width: 52px;
}

.inputField {
margin-top: 10px;
margin-bottom: 10px;
background-color: white;
box-shadow: 0 1px 1px #31bb6b;
}
.inputFieldModal {
margin-bottom: 10px;
background-color: white;
box-shadow: 0 1px 1px #31bb6b;
}
.inputField > button {
padding-top: 10px;
padding-bottom: 10px;
}
.TableImage {
object-fit: cover;
width: 50px !important;
height: 50px !important;
border-radius: 100% !important;
}
.tableHead {
background-color: #31bb6b !important;
color: white;
border-radius: 20px !important;
padding: 20px;
margin-top: 20px;
}

.tableHead :nth-first-child() {
border-top-left-radius: 20px;
}

.mainpageright > hr {
margin-top: 10px;
width: 100%;
margin-left: -15px;
margin-right: -15px;
margin-bottom: 20px;
}
.rowBackground {
background-color: var(--bs-white);
}
.tableHeader {
background-color: var(--bs-primary);
color: var(--bs-white);
font-size: 16px;
}
.addButton {
width: 7em;
position: absolute;
right: 1rem;
top: 1rem;
}

.createModal {
margin-top: 20vh;
margin-left: 13vw;
max-width: 80vw;
}

.icon {
transform: scale(1.5);
color: var(--bs-danger);
margin-bottom: 1rem;
}

.message {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}

.titlemodal {
color: var(--bs-gray-600);
font-weight: 600;
font-size: 20px;
margin-top: 1rem;
width: 65%;
}

.editDelBtns {
display: flex;
justify-content: space-around;
}

.greenregbtn {
margin-bottom: 20px;
margin-left: 85%;
}

.datatable {
margin-top: 5rem;
}

.datediv {
display: flex;
}

@-webkit-keyframes load8 {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes load8 {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
Loading

0 comments on commit 2c36281

Please sign in to comment.