Merge branch 'hotfix/add_presupuesto_comentarios' into 'main'

arreglado el comentario de administrador cuando no tiene id de presupuesto

See merge request jjimenez/erp-imprimelibros!30

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 spring.application.name=erp
 # Active profile
-spring.profiles.active=dev
-#spring.profiles.active=test
+#spring.profiles.active=dev
+spring.profiles.active=test
 #spring.profiles.active=prod
 
 

src/main/resources/db/changelog/changesets/0001-baseline.yml

@@ -539,13 +539,13 @@ databaseChangeLog:
         - column:
             constraints:
               nullable: false
-            defaultValueComputed: CURRENT_TIMESTAMP(3)
+            defaultValueComputed: CURRENT_TIMESTAMP
             name: created_at
             type: datetime
         - column:
             constraints:
               nullable: false
-            defaultValueComputed: CURRENT_TIMESTAMP(3) on update CURRENT_TIMESTAMP(3)
+            defaultValueComputed: CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP
             name: updated_at
             type: datetime
         - column:
@@ -573,6 +573,7 @@ databaseChangeLog:
             name: iva_reducido
             type: BIT(1)
         tableName: presupuesto
+
 - changeSet:
     id: 1761213112413-10
     author: jjimenez (generated)
@@ -840,7 +841,7 @@ databaseChangeLog:
         associatedWith: ''
         columns:
         - column:
-            defaultValueNumeric: !!float '0'
+            defaultValueNumeric: 0
             name: deleted
         indexName: idx_presupuesto_deleted
         tableName: presupuesto

src/main/resources/db/changelog/changesets/0018-change-presupuesto-ch-3.yml

@@ -2,12 +2,25 @@ databaseChangeLog:
   - changeSet:
       id: 0018-change-presupuesto-ch-3
       author: jjo
+
       preConditions:
+        - onFail: MARK_RAN
+        - onError: HALT
         - dbms:
             type: mysql
+        - sqlCheck:
+            expectedResult: 1
+            sql: |
+              SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END
+              FROM information_schema.TABLE_CONSTRAINTS
+              WHERE CONSTRAINT_SCHEMA = DATABASE()
+                AND TABLE_NAME = 'presupuesto'
+                AND CONSTRAINT_NAME = 'presupuesto_chk_3'
+                AND CONSTRAINT_TYPE = 'CHECK';
 
       changes:
         - sql:
+            dbms: mysql
             splitStatements: false
             stripComments: true
             sql: |
@@ -16,6 +29,7 @@ databaseChangeLog:
 
       rollback:
         - sql:
+            dbms: mysql
             splitStatements: false
             stripComments: true
             sql: |

src/main/resources/templates/imprimelibros/presupuestos/presupuestador.html

@@ -158,7 +158,7 @@
 										aria-labelledby="accordionComentario" data-bs-parent="#accordionlefticon">
 										<div class="accordion-body">
 											<div class="snow-editor" id="comentario" name="comentario"
-												th:attr="data-contenido=${presupuesto.comentario} "
+												th:attr="data-contenido=${presupuesto != null ? presupuesto.comentario : ''} "
 												style=" height: 300px;">
 											</div> <!-- end Snow-editor-->
 										</div>