Skip to content

Commit

Permalink
ref #793 done
Browse files Browse the repository at this point in the history
  • Loading branch information
CharlesGrimont committed Nov 28, 2024
1 parent 8291f0f commit 4c50219
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/en.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta172",
"version_c8o": "2.0.0-beta173",
"reset_to_default_values": "Reset to default values",
"general_settings": "General settings",
"font_size": "Font size",
Expand Down
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/es.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta172",
"version_c8o": "2.0.0-beta173",
"reset_to_default_values": "Restablecer los valores predeterminados",
"general_settings": "Configuración general",
"font_size": "Tamaño de fuente",
Expand Down
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/fr.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta172",
"version_c8o": "2.0.0-beta173",
"reset_to_default_values": "Réinitialiser les valeurs par défaut",
"general_settings": "Paramètres généraux",
"font_size": "Taille de police",
Expand Down
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/it.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta172",
"version_c8o": "2.0.0-beta173",
"reset_to_default_values": "Reimposta i valori predefiniti",
"general_settings": "Impostazioni generali",
"font_size": "Dimensione del carattere",
Expand Down
13 changes: 10 additions & 3 deletions _c8oProject/mobilePages/editorPage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -871,10 +871,11 @@ scriptContent:
const childIds = elemToMove[''childrenRefs''] || [];
const elementsToMove = [elemToMove, ...this.formsList.filter(item => childIds.includes(item[''id'']))];

let indexRemoved = null;
elementsToMove.forEach(element => {
const index = this.formsList.findIndex(item => item[''id''] === element[''id'']);
if (index > -1) {
this.formsList.splice(index, 1);
indexRemoved = this.formsList.findIndex(item => item[''id''] === element[''id'']);
if (indexRemoved > -1) {
this.formsList.splice(indexRemoved, 1);
}
});

Expand Down Expand Up @@ -908,6 +909,9 @@ scriptContent:
if (!Array.isArray(newParent["childrenRefs"])) {
newParent["childrenRefs"] = [];
}
if(indexDest[0] == indexOrigin[0] && indexRemoved < indexDest[1]){
indexDest[1] --;
}
newParent["childrenRefs"].splice(indexDest[1], 0, elemToMoveId);

const parentIndex = this.formsList.findIndex(item => item[''id''] === newParent[''id'']);
Expand All @@ -925,6 +929,9 @@ scriptContent:
}
} else {
let insertIndex = indexDest[0];
if(indexRemoved < indexDest[0]){
insertIndex--;
}
this.formsList.splice(insertIndex, 0, ...elementsToMove);
}

Expand Down
2 changes: 1 addition & 1 deletion c8oProject.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
contextTimeout: ${C8Oforms.context.timeout=60}
corsOrigin: =Origin
httpSessionTimeout: ${C8Oforms.http_session.timeout=60}
version: 2.0.0-beta172
version: 2.0.0-beta173
↓c8oforms_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_fs.yaml
↓c8oforms_response_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_response_fs.yaml
↓HTTP_connector [connectors.HttpConnector]: 🗏 connectors/HTTP_connector.yaml
Expand Down
2 changes: 1 addition & 1 deletion ngswForPWA/ngsw-config-sub-pwa.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"appData": {
"name": "Convertigo Forms Builder",
"description": "A simple and intuitive \"no code\" tool to create your personalized apps in a few clicks!",
"version": "2.0.0-beta172"
"version": "2.0.0-beta173"
},
"assetGroups": [
{
Expand Down

0 comments on commit 4c50219

Please sign in to comment.