diff --git a/src/components/common/VnForm.vue b/src/components/common/VnForm.vue index d5329c42..fd34e8ac 100644 --- a/src/components/common/VnForm.vue +++ b/src/components/common/VnForm.vue @@ -179,10 +179,17 @@ const generateSqlQuery = () => { }; onMounted(async () => { - if (!props.formInitialData && props.autoLoad) { + if (!props.formInitialData) { fetchFormData(); } else { formData.value = { ...props.formInitialData }; + // Como no se ejecuta la query fetchFormData y no se obtienen las columnas de la tabla, se inicializan con las keys del objeto formInitialData + modelInfo.value = { + columns: Object.keys(props.formInitialData).map(col => ({ + name: col + })), + data: [props.formInitialData] + }; } }); @@ -197,7 +204,7 @@ defineExpose({ @@ -224,12 +231,12 @@ defineExpose({ @@ -242,9 +249,16 @@ defineExpose({ .form-container { width: 100%; height: max-content; + padding: 0 !important; max-width: 544px; - padding: 32px; display: flex; justify-content: center; } + +.form { + display: flex; + flex-direction: column; + padding: 32px; + width: 100%; +} diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js index ce9f5864..74106bfe 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -61,5 +61,6 @@ export default { adminNewsDetails: 'Afegir o editar notícia', // orderLoadedIntoBasket: 'Comanda carregada a la cistella!', - at: 'a les' + at: 'a les', + back: 'Tornar' }; diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index e5c1cf7b..5eb5753c 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -75,6 +75,7 @@ export default { // orderLoadedIntoBasket: 'Order loaded into basket!', at: 'at', + back: 'Back', orders: 'Orders', order: 'Pending order', diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index 5fc23408..71a9223d 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -81,6 +81,7 @@ export default { // orderLoadedIntoBasket: '¡Pedido cargado en la cesta!', at: 'a las', + back: 'Volver', orders: 'Pedidos', order: 'Pedido pendiente', diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index 09256456..2edf2e48 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -61,5 +61,6 @@ export default { adminNewsDetails: 'Ajouter ou editer nouvelles', // orderLoadedIntoBasket: 'Commande chargée dans le panier!', - at: 'à' + at: 'à', + back: 'Retour' }; diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index a9219dc4..a9199cb5 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -62,5 +62,6 @@ export default { adminNewsDetails: 'Ajouter ou editer nouvelles', // orderLoadedIntoBasket: 'Pedido carregado na cesta!', - at: 'às' + at: 'às', + back: 'Voltar' }; diff --git a/src/js/db/sqlService.js b/src/js/db/sqlService.js index 1a64e682..47464752 100644 --- a/src/js/db/sqlService.js +++ b/src/js/db/sqlService.js @@ -37,12 +37,18 @@ export const generateInsertSqlQuery = ( columnsUpdated, createModelDefault ) => { - const columns = [createModelDefault.field, ...columnsUpdated].join(', '); - const values = [ - createModelDefault.value, - ...columnsUpdated.map(colName => sanitizeValue(formData[colName])) - ].join(', '); + const columns = createModelDefault.field + ? [createModelDefault.field, ...columnsUpdated].join(', ') + : columnsUpdated.join(', '); + const values = createModelDefault.value + ? [ + createModelDefault.value, + ...columnsUpdated.map(colName => sanitizeValue(formData[colName])) + ].join(', ') + : columnsUpdated + .map(colName => sanitizeValue(formData[colName])) + .join(', '); return ` START TRANSACTION; INSERT INTO ${schema}.${table} (${columns}) VALUES (${values}); diff --git a/src/pages/Account/AddressDetails.vue b/src/pages/Account/AddressDetails.vue index 3498c6a3..dd17b636 100644 --- a/src/pages/Account/AddressDetails.vue +++ b/src/pages/Account/AddressDetails.vue @@ -117,7 +117,6 @@ onMounted(() => getCountries()); en-US: - back: Back accept: Accept addEditAddress: Add or edit address name: Consignee @@ -128,7 +127,6 @@ en-US: province: Province addressChangedSuccessfully: Address changed successfully es-ES: - back: Volver accept: Aceptar addEditAddress: Añadir o modificar dirección name: Consignatario @@ -139,7 +137,6 @@ es-ES: province: Distrito addressChangedSuccessfully: Dirección modificada correctamente ca-ES: - back: Tornar accept: Acceptar addEditAddress: Afegir o modificar adreça name: Consignatari @@ -150,7 +147,6 @@ ca-ES: province: Província addressChangedSuccessfully: Adreça modificada correctament fr-FR: - back: Retour accept: Accepter addEditAddress: Ajouter ou modifier l'adresse name: Destinataire @@ -161,7 +157,6 @@ fr-FR: province: Province addressChangedSuccessfully: Adresse modifié avec succès pt-PT: - back: Voltar accept: Aceitar addEditAddress: Adicionar ou modificar morada name: Consignatario diff --git a/src/pages/Admin/NewsDetails.vue b/src/pages/Admin/NewsDetails.vue index 36357ad3..8846da6b 100644 --- a/src/pages/Admin/NewsDetails.vue +++ b/src/pages/Admin/NewsDetails.vue @@ -1 +1,253 @@ - + + + + + +en-US: + addNew: Add new + confirmDeleteAddress: Are you sure you want to delete this new? + title: Title + tag: Tag + priority: Priority +es-ES: + addNew: Añadir noticia + confirmDeleteAddress: ¿Estás seguro de que quieres eliminar esta noticia? + title: Título + tag: Etiqueta + priority: Prioridad +ca-ES: + addNew: Afegir noticia + confirmDeleteAddress: Estàs segur que vols eliminar aquesta notícia? + title: Títol + tag: Etiqueta + priority: Prioritat +fr-FR: + addNew: Ajouter nouvelles + confirmDeleteAddress: Êtes-vous sûr de vouloir supprimer cette nouvelle? + title: Titre + tag: Tag + priority: Priorité +pt-PT: + addNew: Adicionar noticia + confirmDeleteAddress: Tem a certeza que deseja eliminar esta notícia? + title: Título + tag: Etiqueta + priority: Prioridade + diff --git a/src/pages/Admin/NewsView.vue b/src/pages/Admin/NewsView.vue index 607a27d2..68f7351a 100644 --- a/src/pages/Admin/NewsView.vue +++ b/src/pages/Admin/NewsView.vue @@ -1 +1,134 @@ - + + + + + +en-US: + addNew: Add new + confirmDeleteAddress: Are you sure you want to delete this new? +es-ES: + addNew: Añadir noticia + confirmDeleteAddress: ¿Estás seguro de que quieres eliminar esta noticia? +ca-ES: + addNew: Afegir noticia + confirmDeleteAddress: Estàs segur que vols eliminar aquesta notícia? +fr-FR: + addNew: Ajouter nouvelles + confirmDeleteAddress: Êtes-vous sûr de vouloir supprimer cette nouvelle? +pt-PT: + addNew: Adicionar noticia + confirmDeleteAddress: Tem a certeza que deseja eliminar esta notícia? +