bugfix di alcuni problemi di interfaccia

2026-04-11 22:00:48 +02:00
parent 45968b28e2
commit 35e3c51623
19 changed files with 119 additions and 62 deletions
--- a/.jhipster/AuditLog.json
+++ b/.jhipster/AuditLog.json
@@ -37,11 +37,11 @@
  "pagination": "pagination",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "username",
      "otherEntityName": "utenteApp",
      "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Conferma.json
+++ b/.jhipster/Conferma.json
@@ -20,18 +20,18 @@
  "pagination": "pagination",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "username",
      "otherEntityName": "utenteApp",
      "relationshipName": "confermataDa",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    },
    {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-one",
      "otherEntityName": "prenotazione",
      "otherEntityRelationshipName": "conferma",
-      "relationshipName": "prenotazione"
+      "relationshipName": "prenotazione",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Disponibilita.json
+++ b/.jhipster/Disponibilita.json
@@ -44,12 +44,12 @@
  "pagination": "infinite-scroll",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "nome",
      "otherEntityName": "struttura",
      "otherEntityRelationshipName": "disponibilita",
      "relationshipName": "struttura",
-      "otherEntityField": "nome"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Liberatoria.json
+++ b/.jhipster/Liberatoria.json
@@ -13,18 +13,18 @@
  "name": "Liberatoria",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "username",
      "otherEntityName": "utenteApp",
      "otherEntityRelationshipName": "liberatorie",
      "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    },
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
      "otherEntityName": "modelloLiberatoria",
-      "relationshipName": "modelloLiberatoria"
+      "relationshipName": "modelloLiberatoria",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Messaggio.json
+++ b/.jhipster/Messaggio.json
@@ -21,11 +21,11 @@
  "name": "Messaggio",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "username",
      "otherEntityName": "utenteApp",
      "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/ModelloLiberatoria.json
+++ b/.jhipster/ModelloLiberatoria.json
@@ -29,11 +29,11 @@
  "name": "ModelloLiberatoria",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
      "otherEntityName": "struttura",
      "otherEntityRelationshipName": "moduliLiberatorie",
-      "relationshipName": "struttura"
+      "relationshipName": "struttura",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Notifica.json
+++ b/.jhipster/Notifica.json
@@ -41,10 +41,10 @@
  "pagination": "pagination",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
      "otherEntityName": "conferma",
-      "relationshipName": "conferma"
+      "relationshipName": "conferma",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Prenotazione.json
+++ b/.jhipster/Prenotazione.json
@@ -36,25 +36,25 @@
  "pagination": "pagination",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "one-to-one",
      "otherEntityName": "conferma",
      "otherEntityRelationshipName": "prenotazione",
-      "relationshipName": "conferma"
+      "relationshipName": "conferma",
+      "relationshipSide": "left",
+      "relationshipType": "one-to-one"
    },
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "username",
      "otherEntityName": "utenteApp",
      "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    },
    {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
+      "otherEntityField": "nome",
      "otherEntityName": "struttura",
      "relationshipName": "struttura",
-      "otherEntityField": "nome"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/Struttura.json
+++ b/.jhipster/Struttura.json
@@ -43,18 +43,18 @@
  "pagination": "pagination",
  "relationships": [
    {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-many",
      "otherEntityName": "disponibilita",
      "otherEntityRelationshipName": "struttura",
-      "relationshipName": "disponibilita"
+      "relationshipName": "disponibilita",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-many"
    },
    {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-many",
      "otherEntityName": "modelloLiberatoria",
      "otherEntityRelationshipName": "struttura",
-      "relationshipName": "moduliLiberatorie"
+      "relationshipName": "moduliLiberatorie",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-many"
    }
  ],
  "searchEngine": "no",
--- a/.jhipster/UtenteApp.json
+++ b/.jhipster/UtenteApp.json
@@ -22,8 +22,8 @@
    {
      "fieldName": "ruolo",
      "fieldType": "Ruolo",
-      "fieldValues": "USER,INCARICATO,ADMIN",
-      "fieldValidateRules": ["required"]
+      "fieldValidateRules": ["required"],
+      "fieldValues": "USER,INCARICATO,ADMIN"
    },
    {
      "fieldName": "attivo",
@@ -74,19 +74,19 @@
  "name": "UtenteApp",
  "relationships": [
    {
-      "relationshipSide": "left",
-      "relationshipType": "one-to-one",
+      "otherEntityField": "login",
      "otherEntityName": "user",
      "relationshipName": "internalUser",
-      "otherEntityField": "login",
+      "relationshipSide": "left",
+      "relationshipType": "one-to-one",
      "relationshipWithBuiltInEntity": true
    },
    {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-many",
      "otherEntityName": "liberatoria",
      "otherEntityRelationshipName": "utente",
-      "relationshipName": "liberatorie"
+      "relationshipName": "liberatorie",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-many"
    }
  ],
  "searchEngine": "no",
--- a/.yo-rc.json
+++ b/.yo-rc.json
@@ -35,6 +35,7 @@
    "lastLiquibaseTimestamp": 1765383090000,
    "microfrontend": null,
    "microfrontends": [],
+    "monorepository": true,
    "nativeLanguage": "it",
    "packageName": "it.sw.pa.comune.artegna",
    "prodDatabaseType": "postgresql",
@@ -42,10 +43,9 @@
    "rememberMeKey": "c3201ccf39b5d82ef696ad12b95009f33d980fc0468a86e957ad91487d1fe80d9440f72a1d09721585bc96b11048fda07240",
    "serverPort": null,
    "serviceDiscoveryType": null,
+    "skipCommitHook": true,
    "syncUserWithIdp": null,
    "testFrameworks": ["cypress"],
-    "withAdminUi": true,
-    "monorepository": true,
-    "skipCommitHook": true
+    "withAdminUi": true
  }
 }
--- a/docker-compose/.yo-rc.json
+++ b/docker-compose/.yo-rc.json
@@ -0,0 +1,10 @@
+{
+  "generator-jhipster": {
+    "appsFolders": ["smartbooking"],
+    "deploymentType": "docker-compose",
+    "directoryPath": "../../",
+    "jwtSecretKey": "MDQwNzk2YjgyMzE3NjQxNWViNzQyZThjNmJjNjI1YzBmZGRiYzBmYzMxNjg2ODM4MGMxOTFjM2NiNGUxMDE1ZWFiODA0ZTA1M2JkZjM5NThhNTc3YzViY2MxY2IxYTNiYWQ0Zg==",
+    "monitoring": "no",
+    "serviceDiscoveryType": "no"
+  }
+}
--- a/docker-compose/README-DOCKER-COMPOSE.md
+++ b/docker-compose/README-DOCKER-COMPOSE.md
@@ -0,0 +1,14 @@
+# JHipster generated Docker-Compose configuration
+
+## Usage
+
+Launch all your infrastructure by running: `docker compose up -d`.
+
+## Configured Docker services
+
+### Applications and dependencies:
+
+- smartbooking (monolith application)
+- smartbooking's postgresql database
+
+### Additional Services:
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -0,0 +1,31 @@
+services:
+  smartbooking:
+    image: git.bigc.it/sbierti/smartbooking:latest
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - SPRING_PROFILES_ACTIVE=prod,api-docs
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://smartbooking-postgresql:5432/smartbooking
+      - SPRING_LIQUIBASE_URL=jdbc:postgresql://smartbooking-postgresql:5432/smartbooking
+      - JHIPSTER_SLEEP=30
+    ports:
+      - 8080:8080
+    depends_on:
+      - postgresql
+  postgresql:
+    image: postgres:18.1
+    # volumes:
+    #   - ~/volumes/jhipster/smartbooking/postgresql/:/var/lib/postgresql/data/
+    environment:
+      - POSTGRES_USER=smartbooking
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    healthcheck:
+      test: [ 'CMD-SHELL', 'pg_isready -U $${POSTGRES_USER}' ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:5432:5432
+
--- a/src/main/webapp/app/account/register/register.vue
+++ b/src/main/webapp/app/account/register/register.vue
@@ -139,11 +139,11 @@
          <button type="submit" :disabled="v$.$invalid" class="btn btn-primary" data-cy="submit">{{ t$('register.form.button') }}</button>
        </form>
        <p></p>
-        <div class="alert alert-warning">
+        <!--div class="alert alert-warning">
          <span>{{ t$('global.messages.info.authenticated.prefix') }}</span>
          <a class="alert-link" @click="showLogin()">{{ t$('global.messages.info.authenticated.link') }}</a
          ><span v-html="t$('global.messages.info.authenticated.suffix')"></span>
-        </div>
+        </div-->
      </div>
    </div>
  </div>
--- a/src/main/webapp/app/core/home/home.vue
+++ b/src/main/webapp/app/core/home/home.vue
@@ -11,20 +11,21 @@
        <div class="alert alert-success" v-if="authenticated">
          <span v-if="username">{{ t$('home.logged.message', { username }) }}</span>
        </div>
-        <button class="btn btn-primary jhi-create-entity" v-if="authenticated">
+        <button class="btn btn-primary jh-create-entity create-prenotazione" v-if="authenticated && !profileIncomplete && !checkingProfile">
          <router-link to="/prenotazione">{{ t$('home.prenotazioni') }}</router-link>
        </button>
        <div class="alert alert-warning" v-if="authenticated && profileIncomplete && !checkingProfile">
          <span>{{ t$('home.profile.incomplete.message') }}</span>
-          &nbsp;
-          <router-link class="alert-link" to="/account/profile">{{ t$('home.profile.incomplete.link') }}</router-link>
+          <div>
+            <router-link class="alert-link" to="/account/profile">{{ t$('home.profile.incomplete.link') }}</router-link>
+          </div>
        </div>

-        <div class="alert alert-warning" v-if="!authenticated">
+        <!--div class="alert alert-warning" v-if="!authenticated">
          <span>{{ t$('global.messages.info.authenticated.prefix') }}</span>
          <a class="alert-link" @click="showLogin()">{{ t$('global.messages.info.authenticated.link') }}</a
          ><span v-html="t$('global.messages.info.authenticated.suffix')"></span>
-        </div>
+        </div-->
        <div class="alert alert-warning" v-if="!authenticated">
          <span>{{ t$('global.messages.info.register.noaccount') }}</span
          >&nbsp;
--- a/src/main/webapp/app/entities/disponibilita/disponibilita.vue
+++ b/src/main/webapp/app/entities/disponibilita/disponibilita.vue
@@ -125,8 +125,8 @@
            </td>
          </tr>
        </tbody>
-        <span ref="infiniteScrollEl"></span>
      </table>
+      <span ref="infiniteScrollEl"></span>
    </div>
    <b-modal ref="removeEntity" id="removeEntity">
      <template #title>
--- a/src/main/webapp/app/entities/prenotazione/prenotazione-form-user.vue
+++ b/src/main/webapp/app/entities/prenotazione/prenotazione-form-user.vue
@@ -311,7 +311,7 @@
          class="btn btn-sm btn-outline-primary"
        >
          <font-awesome-icon icon="download"></font-awesome-icon>
-          {{ t$('entity.action.download') }}
+          {{ t$('smartbookingApp.modelloLiberatoria.download') }}
        </a>
      </div>

--- a/src/main/webapp/i18n/it/modelloLiberatoria.json
+++ b/src/main/webapp/i18n/it/modelloLiberatoria.json
@@ -21,6 +21,7 @@
      "nome": "Nome",
      "testo": "Testo",
      "documento": "Documento",
+      "download": "Download documento",
      "validoDal": "Valido Dal",
      "validoAl": "Valido Al",
      "struttura": "Struttura"