From 39fb002d4c471924842132fe9d86fd3796150c32 Mon Sep 17 00:00:00 2001
From: tommaso <tommaso.cippitelli@protocollicreativi.it>
Date: Tue, 22 Jul 2025 16:06:36 +0200
Subject: [PATCH] second commit

---
 administrator/forms/circolare.xml         |  2 +-
 administrator/sql/install.mysql.utf8.sql  | 52 +++++++++++------------
 administrator/tmpl/circolare/edit.php     |  2 +-
 administrator/tmpl/circolares/default.php |  2 +-
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/administrator/forms/circolare.xml b/administrator/forms/circolare.xml
index 43ab7ef..c59df8d 100644
--- a/administrator/forms/circolare.xml
+++ b/administrator/forms/circolare.xml
@@ -27,4 +27,4 @@
             </field>
             <field name="scadenza" type="calendar" label="Data Scadenza Firma" format="%Y-%m-%d"/>
         </fieldset>
-    </fields><fieldset name="basic" label="COM_CIRCOLARI_FIELDSET_BASIC"><field name="tipologia_firma" type="sql" label="Tipologia Firma" query="SELECT id AS value, nome AS text FROM #__circolari_firmetipi WHERE state = 1 ORDER BY nome" key_field="value" value_field="text" class="form-select" required="false" description="Seleziona la tipologia di firma richiesta per questa circolare."/></fieldset></form>
+    </fields><fieldset name="basic" label="COM_CIRCOLARI_FIELDSET_BASIC"><field name="tipologia_firma_id" type="sql" label="Tipologia Firma" query="SELECT id AS value, nome AS text FROM #__circolari_firmetipi WHERE state = 1 ORDER BY nome" key_field="value" value_field="text" class="form-select" required="false" description="Seleziona la tipologia di firma richiesta per questa circolare."/></fieldset></form>
diff --git a/administrator/sql/install.mysql.utf8.sql b/administrator/sql/install.mysql.utf8.sql
index f663eb9..edf757b 100644
--- a/administrator/sql/install.mysql.utf8.sql
+++ b/administrator/sql/install.mysql.utf8.sql
@@ -1,32 +1,31 @@
 CREATE TABLE IF NOT EXISTS `#__circolari` (
-`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-`state` TINYINT(1)  NULL  DEFAULT 1,
-`ordering` INT(11)  NULL  DEFAULT 0,
-`checked_out` INT(11)  UNSIGNED,
-`checked_out_time` DATETIME NULL  DEFAULT NULL ,
-`created_by` INT(11)  NULL  DEFAULT 0,
-`modified_by` INT(11)  NULL  DEFAULT 0,
-`title` VARCHAR(255)  NULL  DEFAULT "",
-`description` TEXT NULL ,
-`attachment` VARCHAR(255)  NULL  DEFAULT "",
-`image` VARCHAR(255)  NULL  DEFAULT "",
-PRIMARY KEY (`id`)
-,KEY `idx_state` (`state`)
-,KEY `idx_checked_out` (`checked_out`)
-,KEY `idx_created_by` (`created_by`)
-,KEY `idx_modified_by` (`modified_by`)
+  `state` TINYINT(1) NULL DEFAULT 1,
+  `ordering` INT(11) NULL DEFAULT 0,
+  `checked_out` INT(11) UNSIGNED,
+  `checked_out_time` DATETIME NULL DEFAULT NULL,
+  `created_by` INT(11) NULL DEFAULT 0,
+  `modified_by` INT(11) NULL DEFAULT 0,
+  `title` VARCHAR(255) NULL DEFAULT "",
+  `description` TEXT NULL,
+  `attachment` VARCHAR(255) NULL DEFAULT "",
+  `image` VARCHAR(255) NULL DEFAULT "",
+  `tipologia_firma_id` INT(11) DEFAULT NULL,
+  `firma_obbligatoria` TINYINT(1) DEFAULT 0,
+  `scadenza` DATE DEFAULT NULL,
+
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_checked_out` (`checked_out`),
+  KEY `idx_created_by` (`created_by`),
+  KEY `idx_modified_by` (`modified_by`),
+  KEY `idx_tipologia_firma_id` (`tipologia_firma_id`),
+
+  CONSTRAINT `fk_tipologia_firma` FOREIGN KEY (`tipologia_firma_id`) REFERENCES `#__circolari_firmetipi` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) DEFAULT COLLATE=utf8mb4_unicode_ci;
 
-
-
--- Aggiunta campi extra alla tabella circolari
-ALTER TABLE `#__circolari`
-ADD COLUMN `tipologia_firma` ENUM('presa_visione','aderisco','non_aderisco','non_in_servizio') DEFAULT 'presa_visione',
-ADD COLUMN `firma_obbligatoria` TINYINT(1) DEFAULT 0,
-ADD COLUMN `scadenza` DATE DEFAULT NULL;
-
--- Creazione tabella firme se non esiste
+-- Tabella firme
 CREATE TABLE IF NOT EXISTS `#__circolari_firme` (
   `id` INT NOT NULL AUTO_INCREMENT,
   `circolare_id` INT NOT NULL,
@@ -37,8 +36,7 @@ CREATE TABLE IF NOT EXISTS `#__circolari_firme` (
   UNIQUE KEY `firma_unica` (`circolare_id`, `user_id`)
 );
 
-
--- Tabella delle tipologie di firma (per gestione dinamica)
+-- Tabella delle tipologie di firma
 CREATE TABLE IF NOT EXISTS `#__circolari_firmetipi` (
   `id` INT(11) NOT NULL AUTO_INCREMENT,
   `nome` VARCHAR(100) NOT NULL,
diff --git a/administrator/tmpl/circolare/edit.php b/administrator/tmpl/circolare/edit.php
index 0ddfdea..042df92 100644
--- a/administrator/tmpl/circolare/edit.php
+++ b/administrator/tmpl/circolare/edit.php
@@ -37,7 +37,7 @@ HTMLHelper::_('bootstrap.tooltip');
 				<?php echo $this->form->renderField('description'); ?>
 				<?php echo $this->form->renderField('attachment'); ?>
 				<?php echo $this->form->renderField('image'); ?>
-				<?php echo $this->form->renderField('tipologia_firma'); ?>
+				<?php echo $this->form->renderField('tipologia_firma_id'); ?>
 			</fieldset>
 		</div>
 	</div>
diff --git a/administrator/tmpl/circolares/default.php b/administrator/tmpl/circolares/default.php
index 4df70c0..3597a56 100644
--- a/administrator/tmpl/circolares/default.php
+++ b/administrator/tmpl/circolares/default.php
@@ -107,7 +107,7 @@ if (!empty($saveOrder)) {
 										<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
 									</a>
 								</td>
-								<td><?php echo htmlspecialchars($item->tipologia_firma, ENT_QUOTES, "UTF-8"); ?></td>
+								<td><?php echo htmlspecialchars($item->tipologia_firma_id, ENT_QUOTES, "UTF-8"); ?></td>
 								<td><?php echo $item->firma_obbligatoria ? 'Sì' : 'No'; ?></td>
 								<td><?php echo $item->scadenza; ?></td>
 								<?php if (isset($this->items[0]->ordering)) : ?>