Merge remote-tracking branch 'origin/main' into 2025_10_27_mulilingual_candidate_parameters

Author: lorisadmin

.github/labeler.yml

@@ -216,4 +216,8 @@ RaisinBread:
 
 "Language: SQL":
 - changed-files:
-  - any-glob-to-any-file: '**/*.sql'
+  - any-glob-to-any-file: '**/*.sql'
+
+"Multilingual":
+- changed-files:
+  - any-glob-to-any-file: '**/*.po'

Makefile

@@ -182,7 +182,9 @@ CREATE TABLE `biobank_specimen_protocol_attribute_rel` (
   `SpecimenAttributeID` int(10) unsigned NOT NULL,
   `Required` tinyint(1) DEFAULT NULL,
   `showInDataTable` tinyint(1) DEFAULT NULL,
+  `OrderIndex` INT UNSIGNED NOT NULL,
   PRIMARY KEY (`SpecimenProtocolID`,`SpecimenAttributeID`),
+  UNIQUE KEY `UK_SpecimenProtocolId_OrderIndex` (`SpecimenProtocolID`, `OrderIndex`),
   KEY `FK_biobank_specimen_protocol_attribute_rel_SpecimenAttributeID` (`SpecimenAttributeID`),
   CONSTRAINT `FK_biobank_specimen_protocol_attribute__rel_SpecimenProtocolID` FOREIGN KEY (`SpecimenProtocolID`) REFERENCES `biobank_specimen_protocol` (`SpecimenProtocolID`),
   CONSTRAINT `FK_biobank_specimen_protocol_attribute_rel_SpecimenAttributeID` FOREIGN KEY (`SpecimenAttributeID`) REFERENCES `biobank_specimen_attribute` (`SpecimenAttributeID`)
@@ -399,6 +401,7 @@ VALUES (1,'Blood Collection',1,1),
 INSERT INTO `biobank_specimen_type_unit_rel` VALUES (1,1),(2,2);
 INSERT INTO `biobank_specimen_type_parent` VALUES (2,1);
 INSERT INTO `biobank_specimen_type_container_type_rel` VALUES (1,1),(2,1);
+INSERT INTO `shipment_type` VALUES (1, 'Gel Pack Container'),(2, 'Insulated Foam Box'),(3, 'Dry Shipper');
 
 -- Insert ConfigSettings for label printing endpoint
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('biobank', 'Settings related to the biobank module', 1, 0, 'Biobank', 16);

SQL/0000-00-06-BiobankTables.sql

@@ -0,0 +1,41 @@
+-- Step 1: Add the column allowing NULL (temporarily)
+-- This allows the operation to succeed on a table that already has existing rows.
+ALTER TABLE biobank_specimen_protocol_attribute_rel
+ADD COLUMN OrderIndex INT UNSIGNED NULL;
+
+-- Step 2: Populate the existing rows with unique, non-NULL OrderIndex values.
+-- This uses a variable-based method to assign a sequential number (0, 1, 2, ...)
+-- to each row within the same SpecimenProtocolID group.
+
+SET @r := -1;
+SET @g := 0;
+
+-- A temporary table/derived table is used to calculate the unique index for each group
+UPDATE biobank_specimen_protocol_attribute_rel AS t1
+INNER JOIN (
+    SELECT
+        t2.SpecimenProtocolID,
+        t2.SpecimenAttributeID,
+        @r := CASE WHEN @g = t2.SpecimenProtocolID THEN @r + 1 ELSE 0 END AS new_OrderIndex,
+        @g := t2.SpecimenProtocolID AS current_group
+    FROM
+        biobank_specimen_protocol_attribute_rel AS t2
+    ORDER BY
+        t2.SpecimenProtocolID, t2.SpecimenAttributeID
+
+) AS ranked_data
+ON t1.SpecimenProtocolID = ranked_data.SpecimenProtocolID
+AND t1.SpecimenAttributeID = ranked_data.SpecimenAttributeID
+SET t1.OrderIndex = ranked_data.new_OrderIndex;
+
+-- Step 3: Enforce the constraints (NOT NULL and UNIQUE).
+-- Now that every row has a valid, unique value, these operations will succeed.
+
+-- 3a. Add the UNIQUE Constraint
+ALTER TABLE biobank_specimen_protocol_attribute_rel
+ADD CONSTRAINT UK_SpecimenProtocolId_OrderIndex
+UNIQUE (SpecimenProtocolID, OrderIndex);
+
+-- 3b. Change the Column to NOT NULL
+ALTER TABLE biobank_specimen_protocol_attribute_rel
+MODIFY COLUMN OrderIndex INT UNSIGNED NOT NULL;

SQL/New_patches/2025-10-29_add-order-index-to-specimen-protocols.sql

@@ -443,7 +443,7 @@ class DataTable extends Component {
             </div>
           </div>
           <div className='alert alert-info no-result-found-panel'>
-            <strong>No result found.</strong>
+            <strong>{this.props.t('No result found.', {ns: 'loris'})}</strong>
           </div>
         </div>
       );

jsx/DataTable.js

@@ -47,14 +47,14 @@ const Modal = ({
   const handleClose = () => {
     if (throwWarning) { // Display warning if enabled
       Swal.fire({
-        title: t('Are You Sure?'),
-        text:
-        t('Leaving the form will result in the'
-          +' loss of any information entered.'),
+        title: t('Are You Sure?', {ns: 'loris'}),
+        text: t('Leaving the form will result in the loss '
+          +'of any information entered.',
+        {ns: 'loris'}),
         type: 'warning',
         showCancelButton: true,
-        confirmButtonText: t('Proceed'),
-        cancelButtonText: t('Cancel'),
+        confirmButtonText: t('Proceed', {ns: 'loris'}),
+        cancelButtonText: t('Cancel', {ns: 'loris'}),
       }).then((result) => result.value && onClose());
     } else {
       onClose(); // Close immediately if no warning
@@ -178,7 +178,7 @@ const Modal = ({
   const loader = loading && (
     <div style={processStyle}>
       <Loader size={20}/>
-      <h5 className='animate-flicker'>{t('Saving')}</h5>
+      <h5 className='animate-flicker'>{t('Saving', {ns: 'loris'})}</h5>
     </div>
   );
 
@@ -191,7 +191,7 @@ const Modal = ({
         style={{color: 'green', marginBottom: '2px'}}
         className='glyphicon glyphicon-ok-circle'
       />
-      <h5>{t('Success!')}</h5>
+      <h5>{t('Success!', {ns: 'loris'})}</h5>
     </div>
   );
 

jsx/Modal.tsx

@@ -496,7 +496,7 @@ class StaticDataTable extends Component {
     if (this.props.Data === null || this.props.Data.length === 0) {
       return (
         <div className='alert alert-info no-result-found-panel'>
-          <strong>No result found.</strong>
+          <strong>{this.props.t('No result found.', {ns: 'loris'})}</strong>
         </div>
       );
     }

jsx/StaticDataTable.js

@@ -124,6 +124,15 @@ msgstr "No"
 msgid "Cancel"
 msgstr "Cancel"
 
+msgid "Clear"
+msgstr "Clear"
+
+msgid "Submit"
+msgstr "Submit"
+
+msgid "Proceed"
+msgstr "Proceed"
+
 # Common candidate terms
 msgid "PSCID"
 msgstr "PSCID"
@@ -147,7 +156,7 @@ msgid "Cohort"
 msgid_plural "Cohorts"
 msgstr[0] "Cohort"
 msgstr[1] "Cohorts"
- 
+
 msgid "Session"
 msgstr "Session"
 

locale/en/LC_MESSAGES/loris.po

@@ -248,6 +248,21 @@ msgstr "Scan hecho"
 msgid "Language"
 msgstr "Lenguaje"
 
+msgid "Access denied"
+msgstr "Acceso denegado"
+
+msgid "No."
+msgstr "número"
+
+msgid "Are you sure?"
+msgstr "Estás seguro?"
+
+msgid "Yes, I am sure!"
+msgstr "¡Sí, estoy seguro!"
+
+msgid "No, cancel it!"
+msgstr "¡No, cancélalo!"
+
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr "{{pageCount}} filas mostradas de {{totalCount}}."

locale/es/LC_MESSAGES/loris.po

@@ -147,13 +147,31 @@ msgstr "Afficher les filtres avancés"
 msgid "Hide Advanced Filters"
 msgstr "Masquer les filtres avancés"
 
+msgid "Fail"
+msgstr "Échec"
+
+msgid "True"
+msgstr "Vrai"
+
+msgid "False"
+msgstr "Faux"
+
+msgid "Selected"
+msgstr "Sélectionné"
+
+msgid "selected"
+msgstr "sélectionné"
+
 # Common swal labels
 msgid "Cancel"
 msgstr "Annuler"
 
 msgid "Success!"
 msgstr "Réussi!"
 
+msgid "Success"
+msgstr "Réussi"
+
 # Common candidate terms
 msgid "PSCID"
 msgstr "PSCID"
@@ -241,6 +259,51 @@ msgstr "Scan complété"
 msgid "Language"
 msgstr "Langue"
 
+msgid "Access denied"
+msgstr "Accès refusé"
+
+msgid "No."
+msgstr "Nombre"
+
+msgid "Are you Sure?"
+msgstr "Es-tu sûr?"
+
+msgid "Are you sure?"
+msgstr "Es-tu sûr?"
+
+msgid "Yes, I am sure!"
+msgstr "Oui, j'en suis sûr!"
+
+msgid "No, cancel it!"
+msgstr "Non, annulez-le !"
+
+msgid "Leaving the form will result in the loss of any information entered."
+msgstr "Quitter le formulaire entraînera la perte de toutes les informations saisies."
+
+msgid "Proceed"
+msgstr "Procéder"
+
+msgid "Previous"
+msgstr "Précédent"
+
+msgid "Next"
+msgstr "Suivant"
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Saving"
+msgstr "Sauvegarde"
+
+msgid "Reset"
+msgstr "Réinitialiser"
+
+msgid "Note"
+msgstr "Note"
+
+msgid "View details"
+msgstr "Voir détails"
+
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr "{{pageCount}} lignes affichées de {{totalCount}}."
@@ -347,3 +410,25 @@ msgstr "{{months}} mois"
 
 msgid "{{years}} years old"
 msgstr "{{years}} ans"
+
+# Other generic terms
+msgid "Loading..."
+msgstr "Chargement..."
+
+msgid "Permission denied"
+msgstr "Permission refusée"
+
+msgid "Unauthorized"
+msgstr "Non-autorisé"
+
+msgid "Submit"
+msgstr "Soumettre"
+
+msgid "Clear"
+msgstr "Effacer"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Dataset"
+msgstr "Ensemble de données"