Replace delete by archive

medecins-du-monde · Apr 21, 2020 · 15774ee · 15774ee
1 parent 1cde4af
commit 15774ee
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 48 deletions.
diff --git a/frontend/src/components/pages/main-list/project-list.html b/frontend/src/components/pages/main-list/project-list.html
@@ -15,8 +15,8 @@
 			translate="project.show_ongoing_projects"></a>
 		<a ng-click="$ctrl.toggleFinished()" class="btn btn-default" ng-class="{active: $ctrl.displayFinished}"
 			translate="project.show_finished_projects"></a>
-		<a ng-click="$ctrl.toggleDeleted()" class="btn btn-default" ng-class="{active: $ctrl.displayDeleted}"
-			translate="project.show_deleted_projects"></a>
+		<a ng-click="$ctrl.toggleArchived()" class="btn btn-default" ng-class="{active: $ctrl.displayArchived}"
+			translate="project.show_archived_projects"></a>
 	</div>
 </div>
 
@@ -53,9 +53,9 @@
 				<span ng-if="!$ctrl.lastInputDate[p._id]" translate="shared.none"></span>
 			</div>
 
-			<div ng-if="!p.active" class="text-danger">
-				<i class="fa fa-fw fa-trash"></i>
-				<span translate="project.was_deleted"></span>
+			<div ng-if="!p.active" class="text-warning">
+				<i class="fa fa-fw fa-archive"></i>
+				<span translate="project.was_archived"></span>
 			</div>
 			<div ng-if="p.active && !p.running" class="text-warning">
 				<i class="fa fa-fw fa-warning"></i>
@@ -111,9 +111,9 @@
 							</a>
 						</li>
 						<li ng-if="p.owner == $root.profile.email">
-							<a ng-click="$ctrl.onDeleteClicked(p)">
-								<i class="fa fa-fw fa-trash text-danger"></i>
-								<span class="text-danger" translate="shared.delete"></span>
+							<a ng-click="$ctrl.onArchiveClicked(p)">
+								<i class="text-warning fa fa-fw fa-archive"></i>
+								<span class="text-warning" translate="shared.archive"></span>
 							</a>
 						</li>
 					</ul>

diff --git a/frontend/src/components/pages/main-list/project-list.js b/frontend/src/components/pages/main-list/project-list.js
@@ -44,7 +44,7 @@ module.component(__componentName, {
 
 			this.displayOngoing = true;
 			this.displayFinished = true;
-			this.displayDeleted = false;
+			this.displayArchived = false;
 		}
 
 		$onChanges(changes) {
@@ -54,7 +54,7 @@ module.component(__componentName, {
 				p.running = p.end > new Date().toISOString().slice(0, 10);
 				p.favorite = !!localStorage['favorites::projects::' + p._id];
 
-				if (!p.active) p.variant = 'deleted';
+				if (!p.active) p.variant = 'archived';
 				else if (!p.running) p.variant = 'dashed';
 				else p.variant = 'default';
 			});
@@ -66,9 +66,9 @@ module.component(__componentName, {
 				const matchSearch = search.includes(needle);
 				const matchOngoing = this.displayOngoing && p.running && p.active;
 				const matchFinished = this.displayFinished && !p.running && p.active;
-				const matchDeleted = this.displayDeleted && !p.active;
+				const matchArchived = this.displayArchived && !p.active;
 
-				return matchSearch && (matchOngoing || matchFinished || matchDeleted)
+				return matchSearch && (matchOngoing || matchFinished || matchArchived)
 			});
 
 			this.displayedProjects.sort((p1, p2) => {
@@ -101,8 +101,8 @@ module.component(__componentName, {
 			this.$onChanges();
 		}
 
-		toggleDeleted() {
-			this.displayDeleted = !this.displayDeleted;
+		toggleArchived() {
+			this.displayArchived = !this.displayArchived;
 			this.$onChanges();
 		}
 
@@ -147,24 +147,20 @@ module.component(__componentName, {
 			this.$window.scrollTo(0, 0);
 		}
 
-		async onDeleteClicked(shortProject) {
-			var question = this.translate('project.are_you_sure_to_delete');
-
-			if (window.confirm(question)) {
-				const project = await Project.get(shortProject._id);
-				project.active = false;
+		async onArchiveClicked(shortProject) {
+			const project = await Project.get(shortProject._id);
+			project.active = false;
 
-				try {
-					await project.save();
+			try {
+				await project.save();
 
-					this.projects = await Project.fetchAll();
-					this.$onChanges();
-					this.$scope.$apply();
-				}
-				catch (error) {
-					// Display message to tell user that it's not possible to save.
-					alert(this.translate('project.saving_failed'));
-				}
+				this.projects = await Project.fetchAll();
+				this.$onChanges();
+				this.$scope.$apply();
+			}
+			catch (error) {
+				// Display message to tell user that it's not possible to save.
+				alert(this.translate('project.saving_failed'));
 			}
 		}
 

diff --git a/frontend/src/components/shared/misc/columns-panel.css b/frontend/src/components/shared/misc/columns-panel.css
@@ -96,15 +96,15 @@ columns-panel .handle {
 
 
 
-  .panel-deleted {
-    border-color: #b33;
+  .panel-archived {
+    border-color: #8a6d3b;
     border-style: dashed;
   }
 
-  .panel-deleted > .panel-heading {
-    color: #b33;
-    background-color: #f5dddd;
-    border-color: #b33;
+  .panel-archived > .panel-heading {
+    color: #8a6d3b;
+    background-color: #EEE9E0;
+    border-color: #8a6d3b;
     border-bottom-style: dashed;
   }
 
diff --git a/frontend/src/translation/en/translations.js b/frontend/src/translation/en/translations.js
@@ -2,6 +2,7 @@
 
 export default {
 	shared: {
+		archive: "Archive",
 		enable: "Enable data entry",
 		disable: "Disable data entry",
 		accept_invitation: "Accept",
@@ -55,7 +56,6 @@ export default {
 		reporting: 'Reporting',
 		reporting_general: 'General reporting',
 		colorize: 'Colorize',
-		download_plot: 'Download plot',
 
 		logout: 'Log Out',
 
@@ -90,10 +90,10 @@ export default {
 		add_datasource: "Create a new data source",
 		no_matches: "No projects match the selected criterias",
 		is_finished: "This project is finished",
-		was_deleted: "This project was deleted",
+		was_archived: "This project was archived",
 		show_ongoing_projects: "Show ongoing projects",
 		show_finished_projects: "Show finished projects",
-		show_deleted_projects: "Show deleted projects",
+		show_archived_projects: "Show archived projects",
 		filter_placeholder: "Enter text here to filter the projects",
 
 		revisions: "History",
@@ -316,7 +316,6 @@ export default {
 
 		show_finished: "See all data entries",
 		are_you_sure_to_uninvite: "Are you sure that you want to remove this project from your list? The owner will have to invite you again if you need access later. Confirm to remove.",
-		are_you_sure_to_delete: "Are you sure that you want to delete this project? Confirm to delete.",
 		data_selection: "Data selection",
 		filters: "Filters",
 		input_status: {

diff --git a/frontend/src/translation/es/translations.js b/frontend/src/translation/es/translations.js
@@ -2,6 +2,7 @@
 
 export default {
 	shared: {
+		archive: "Archivar",
 		enable: "Activar",
 		disable: "Deactivar",
 		accept_invitation: "Acceptar",
@@ -55,7 +56,6 @@ export default {
 		reporting: 'Informe',
 		reporting_general: 'Informe general',
 		colorize: 'Colorear',
-		download_plot: 'Descargar el gráfico',
 
 		logout: 'Desconectar',
 
@@ -90,10 +90,10 @@ export default {
 		add_datasource: "Crear una nueva fuente de datos",
 		no_matches: "Ningún proyecto corresponde a sus criterios de búsqueda",
 		is_finished: "Este proyecto esta terminado",
-		was_deleted: "Este proyecto fue suprimido",
+		was_archived: "Este proyecto fue archivado",
 		show_ongoing_projects: "Mostrar proyectos en curso",
 		show_finished_projects: "Mostrar proyectos terminados",
-		show_deleted_projects: "Mostrar proyectos suprimidos",
+		show_archived_projects: "Mostrar proyectos archivados",
 		filter_placeholder: "Entre texto para buscar proyectos",
 
 		revisions: "Historial",
@@ -316,7 +316,6 @@ export default {
 
 		show_finished: "Ver todas las entradas",
 		are_you_sure_to_uninvite: "¿Esta seguro de querer quitar este proyecto de su lista? El proprietario debera invitarle de nuevo si necesita tener acceso. Confirme para quitarlo",
-		are_you_sure_to_delete: "¿Esta seguro de querer suprimir este proyecto? Confirme para suprimir.",
 		data_selection: "Seleccione los datos",
 		filters: "Filtros",
 		input_status: {

diff --git a/frontend/src/translation/fr/translations.js b/frontend/src/translation/fr/translations.js
@@ -2,6 +2,7 @@
 
 export default {
 	shared: {
+		archive: "Archiver",
 		enable: "Réactiver la saisie",
 		disable: "Désactiver la saisie",
 		accept_invitation: "Accepter",
@@ -55,7 +56,6 @@ export default {
 		reporting: 'Rapport',
 		reporting_general: 'Rapport général',
 		colorize: 'Colorer',
-		download_plot: 'Télécharger le graphique',
 
 		logout: 'Déconnecter',
 
@@ -90,10 +90,10 @@ export default {
 		add_datasource: "Créer une nouvelle source de données",
 		no_matches: "Aucun projet ne correspond à vos critères de recherche",
 		is_finished: "Ce projet est terminé",
-		was_deleted: "Ce projet a été supprimé",
+		was_archived: "Ce projet a été archivé",
 		show_ongoing_projects: "Afficher les projets en cours",
 		show_finished_projects: "Afficher les projets terminés",
-		show_deleted_projects: "Afficher les projets supprimés",
+		show_archived_projects: "Afficher les projets archivés",
 		filter_placeholder: "Rentrez du texte pour filtrer les projets",
 
 		revisions: "Historique",
@@ -316,7 +316,6 @@ export default {
 
 		show_finished: "Voir les saisies réalisées",
 		are_you_sure_to_uninvite: "Êtes-vous sûr de vouloir retirer ce projet? Le propriétaire devra vous inviter à nouveau pour y avoir accès. Confirmez pour retirer.",
-		are_you_sure_to_delete: "Êtes-vous sûr de vouloir supprimer ce projet? Confirmez pour supprimer.",
 		data_selection: "Selection des données",
 		filters: "Filtres",
 		input_status: {