From e8771cbabf74cfcb86167c965285c80333b32315 Mon Sep 17 00:00:00 2001
From: Paul Isaris <paulisaris@gmail.com>
Date: Tue, 3 Dec 2024 14:48:44 +0200
Subject: [PATCH] Fixed questionnaire translation process

---
 .../QuestionnaireLanguageManager.php          |  4 ++
 app/Utils/Translator.php                      |  5 ++
 .../common/StoreModalComponent.vue            | 54 +------------------
 .../questionnaire/QuestionnaireCreateEdit.vue |  6 ++-
 .../questionnaire/QuestionnaireLanguages.vue  |  6 +--
 .../questionnaire/QuestionnaireStatistics.vue | 12 +++--
 resources/assets/sass/shared/modal.scss       | 51 ++++++++++++++++++
 7 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/app/BusinessLogicLayer/Questionnaire/QuestionnaireLanguageManager.php b/app/BusinessLogicLayer/Questionnaire/QuestionnaireLanguageManager.php
index 4a7a7205..710e7863 100644
--- a/app/BusinessLogicLayer/Questionnaire/QuestionnaireLanguageManager.php
+++ b/app/BusinessLogicLayer/Questionnaire/QuestionnaireLanguageManager.php
@@ -31,6 +31,10 @@ public function saveLanguagesForQuestionnaire(array $lang_codes, int $questionna
         $existingQuestionnaireLanguages = $this->getLanguagesForQuestionnaire($questionnaire_id);
         $languagesToDelete = $existingQuestionnaireLanguages->pluck('language.language_code')->toArray();
         for ($i = 0; $i < count($lang_codes); $i++) {
+            // fix for Greek language code
+            if ($lang_codes[$i] === 'gr') {
+                $lang_codes[$i] = 'el';
+            }
             if (in_array($lang_codes[$i], $languagesToDelete)) {
                 array_splice($languagesToDelete, array_search($lang_codes[$i], $languagesToDelete), 1);
             }
diff --git a/app/Utils/Translator.php b/app/Utils/Translator.php
index 7e550a21..635a53b6 100644
--- a/app/Utils/Translator.php
+++ b/app/Utils/Translator.php
@@ -18,6 +18,11 @@ class Translator {
      * @throws \Exception
      */
     public static function translateTexts(array $texts, string $lang_code): array {
+        // fix for Greek language code
+        if ($lang_code === 'gr') {
+            $lang_code = 'el';
+        }
+
         $translate = new TranslateClient(['key' => config('app.google_translate_key')]);
         // Google translate capacity is 100 texts per request.
         // So we need to break the texts into 100-texts batches
diff --git a/resources/assets/js/vue-components/common/StoreModalComponent.vue b/resources/assets/js/vue-components/common/StoreModalComponent.vue
index ecc6b3a0..68427fa6 100644
--- a/resources/assets/js/vue-components/common/StoreModalComponent.vue
+++ b/resources/assets/js/vue-components/common/StoreModalComponent.vue
@@ -49,7 +49,7 @@
 								<button
 									tabindex="-1"
 									type="button"
-									class="mx-auto btn btn-primary"
+									class="mx-auto btn btn-primary btn-slim"
 									@click="$emit('okClicked')"
 								>
 									Close
@@ -92,55 +92,5 @@ export default {
 
 <style scoped lang="scss">
 @import "../../../sass/_variables.scss";
-
-.modal-mask {
-	position: fixed;
-	z-index: 9998;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background-color: rgba(0, 0, 0, 0.5);
-	display: table;
-	transition: opacity 0.3s ease;
-}
-
-.modal-container {
-	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
-	transition: all 0.3s ease;
-}
-
-.modal-wrapper {
-	display: table-cell;
-	vertical-align: top;
-	padding-top: 10%;
-
-	.modal-container {
-		box-shadow: none;
-	}
-}
-
-.modal-body {
-	padding-bottom: 2rem;
-	padding-top: 2rem;
-
-	.message {
-		color: $green;
-		word-break: break-word;
-	}
-}
-
-.modal-enter {
-	opacity: 0;
-}
-
-.modal-leave-active {
-	opacity: 0;
-}
-
-.modal-enter .modal-container,
-.modal-leave-active .modal-container {
-	-webkit-transform: scale(1.1);
-	transform: scale(1.1);
-}
+@import "resources/assets/sass/shared/modal";
 </style>
diff --git a/resources/assets/js/vue-components/questionnaire/QuestionnaireCreateEdit.vue b/resources/assets/js/vue-components/questionnaire/QuestionnaireCreateEdit.vue
index dea54bba..aade2c84 100644
--- a/resources/assets/js/vue-components/questionnaire/QuestionnaireCreateEdit.vue
+++ b/resources/assets/js/vue-components/questionnaire/QuestionnaireCreateEdit.vue
@@ -203,10 +203,12 @@
 						</div>
 					</div>
 
+					<hr class="my-5" />
+
 					<div class="row mb-3">
 						<div class="col-12">
 							<button
-								class="btn btn-primary"
+								class="btn btn-primary btn-slimmer"
 								type="button"
 								data-toggle="collapse"
 								data-target="#collapseHelpFileType"
@@ -573,7 +575,7 @@ export default defineComponent({
 				this.surveyCreator.changeText(response.data.translation);
 				this.surveyCreator.showTranslationEditor();
 				this.modalOpen = false;
-				showToast("Translations generated!", "#28a745", "bottom-right");
+				showToast("Translations generated! Don't forget to Save the questionnaire!", "#28a745", "bottom-right", 7000);
 			} catch (error) {
 				console.error(error);
 				this.modalOpen = false;
diff --git a/resources/assets/js/vue-components/questionnaire/QuestionnaireLanguages.vue b/resources/assets/js/vue-components/questionnaire/QuestionnaireLanguages.vue
index 301e4624..45b7af1d 100644
--- a/resources/assets/js/vue-components/questionnaire/QuestionnaireLanguages.vue
+++ b/resources/assets/js/vue-components/questionnaire/QuestionnaireLanguages.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="modal-component">
-		<common-modal :open="modalOpen" :allow-close="true" :classes="''" @canceled="$emit('canceled')">
+		<common-modal :open="modalOpen" :allow-close="false">
 			<template #header>
 				<h5 class="modal-title pl-2">
 					Mark Questionnaire Languages<span
@@ -51,7 +51,7 @@
 						<div class="col-3 offset-6 pr-0">
 							<button
 								type="button"
-								class="btn btn-outline-secondary btn-lg w-100"
+								class="btn btn-outline-secondary btn-slim w-100"
 								@click="$emit('canceled')"
 							>
 								Cancel
@@ -61,7 +61,7 @@
 							<button
 								:disabled="saveLoading"
 								type="button"
-								class="btn btn-primary btn-lg w-100"
+								class="btn btn-primary btn-slim w-100 "
 								@click="saveQuestionnaireLanguagesStatus"
 							>
 								Save<span
diff --git a/resources/assets/js/vue-components/questionnaire/QuestionnaireStatistics.vue b/resources/assets/js/vue-components/questionnaire/QuestionnaireStatistics.vue
index 40f1af95..e3c82477 100644
--- a/resources/assets/js/vue-components/questionnaire/QuestionnaireStatistics.vue
+++ b/resources/assets/js/vue-components/questionnaire/QuestionnaireStatistics.vue
@@ -368,11 +368,13 @@ export default defineComponent({
 			}).then((res) => res.data);
 		},
 		getQuestionnaireAnswerAdminAnalysisStatuses() {
-			return this.get({
-				url: window.route("questionnaire.answers-admin-analysis-statuses.get"),
-				data: {},
-				urlRelative: false,
-			}).then((res) => res.data);
+			if(this.userCanAnnotateAnswers) {
+				return this.get({
+					url: window.route("questionnaire.answers-admin-analysis-statuses.get"),
+					data: {},
+					urlRelative: false,
+				}).then((res) => res.data);
+			}
 		},
 		initStatistics(answers, answerVotes, answerAnnotations, adminAnalysisStatuses) {
 			// remove from the questions array the questions that should not be displayed in the statistics
diff --git a/resources/assets/sass/shared/modal.scss b/resources/assets/sass/shared/modal.scss
index 28d0b7f0..bb9f8670 100644
--- a/resources/assets/sass/shared/modal.scss
+++ b/resources/assets/sass/shared/modal.scss
@@ -36,3 +36,54 @@
 		}
 	}
 }
+
+.modal-mask {
+	position: fixed;
+	z-index: 9998;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: table;
+	transition: opacity 0.3s ease;
+}
+
+.modal-container {
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
+	transition: all 0.3s ease;
+}
+
+.modal-wrapper {
+	display: table-cell;
+	vertical-align: top;
+	padding-top: 10%;
+
+	.modal-container {
+		box-shadow: none;
+	}
+}
+
+.modal-body {
+	padding-bottom: 2rem;
+	padding-top: 2rem;
+
+	.message {
+		color: $green;
+		word-break: break-word;
+	}
+}
+
+.modal-enter {
+	opacity: 0;
+}
+
+.modal-leave-active {
+	opacity: 0;
+}
+
+.modal-enter .modal-container,
+.modal-leave-active .modal-container {
+	-webkit-transform: scale(1.1);
+	transform: scale(1.1);
+}
\ No newline at end of file