second commit

This commit is contained in:
2025-07-22 16:06:36 +02:00
parent 2a40a54622
commit 39fb002d4c
4 changed files with 28 additions and 30 deletions

View File

@ -27,4 +27,4 @@
</field> </field>
<field name="scadenza" type="calendar" label="Data Scadenza Firma" format="%Y-%m-%d"/> <field name="scadenza" type="calendar" label="Data Scadenza Firma" format="%Y-%m-%d"/>
</fieldset> </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>

View File

@ -1,32 +1,31 @@
CREATE TABLE IF NOT EXISTS `#__circolari` ( 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, `state` TINYINT(1) NULL DEFAULT 1,
`ordering` INT(11) NULL DEFAULT 0, `ordering` INT(11) NULL DEFAULT 0,
`checked_out` INT(11) UNSIGNED, `checked_out` INT(11) UNSIGNED,
`checked_out_time` DATETIME NULL DEFAULT NULL , `checked_out_time` DATETIME NULL DEFAULT NULL,
`created_by` INT(11) NULL DEFAULT 0, `created_by` INT(11) NULL DEFAULT 0,
`modified_by` INT(11) NULL DEFAULT 0, `modified_by` INT(11) NULL DEFAULT 0,
`title` VARCHAR(255) NULL DEFAULT "", `title` VARCHAR(255) NULL DEFAULT "",
`description` TEXT NULL , `description` TEXT NULL,
`attachment` VARCHAR(255) NULL DEFAULT "", `attachment` VARCHAR(255) NULL DEFAULT "",
`image` VARCHAR(255) NULL DEFAULT "", `image` VARCHAR(255) NULL DEFAULT "",
PRIMARY KEY (`id`) `tipologia_firma_id` INT(11) DEFAULT NULL,
,KEY `idx_state` (`state`) `firma_obbligatoria` TINYINT(1) DEFAULT 0,
,KEY `idx_checked_out` (`checked_out`) `scadenza` DATE DEFAULT NULL,
,KEY `idx_created_by` (`created_by`)
,KEY `idx_modified_by` (`modified_by`) 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; ) DEFAULT COLLATE=utf8mb4_unicode_ci;
-- Tabella firme
-- 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
CREATE TABLE IF NOT EXISTS `#__circolari_firme` ( CREATE TABLE IF NOT EXISTS `#__circolari_firme` (
`id` INT NOT NULL AUTO_INCREMENT, `id` INT NOT NULL AUTO_INCREMENT,
`circolare_id` INT NOT NULL, `circolare_id` INT NOT NULL,
@ -37,8 +36,7 @@ CREATE TABLE IF NOT EXISTS `#__circolari_firme` (
UNIQUE KEY `firma_unica` (`circolare_id`, `user_id`) UNIQUE KEY `firma_unica` (`circolare_id`, `user_id`)
); );
-- Tabella delle tipologie di firma
-- Tabella delle tipologie di firma (per gestione dinamica)
CREATE TABLE IF NOT EXISTS `#__circolari_firmetipi` ( CREATE TABLE IF NOT EXISTS `#__circolari_firmetipi` (
`id` INT(11) NOT NULL AUTO_INCREMENT, `id` INT(11) NOT NULL AUTO_INCREMENT,
`nome` VARCHAR(100) NOT NULL, `nome` VARCHAR(100) NOT NULL,

View File

@ -37,7 +37,7 @@ HTMLHelper::_('bootstrap.tooltip');
<?php echo $this->form->renderField('description'); ?> <?php echo $this->form->renderField('description'); ?>
<?php echo $this->form->renderField('attachment'); ?> <?php echo $this->form->renderField('attachment'); ?>
<?php echo $this->form->renderField('image'); ?> <?php echo $this->form->renderField('image'); ?>
<?php echo $this->form->renderField('tipologia_firma'); ?> <?php echo $this->form->renderField('tipologia_firma_id'); ?>
</fieldset> </fieldset>
</div> </div>
</div> </div>

View File

@ -107,7 +107,7 @@ if (!empty($saveOrder)) {
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
</a> </a>
</td> </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->firma_obbligatoria ? 'Sì' : 'No'; ?></td>
<td><?php echo $item->scadenza; ?></td> <td><?php echo $item->scadenza; ?></td>
<?php if (isset($this->items[0]->ordering)) : ?> <?php if (isset($this->items[0]->ordering)) : ?>