meteo/Sentri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.3 #1

Merged
meteo merged 11 commits from 1.3 into main 2026-07-08 21:37:31 +00:00
Conversation 0 Commits 11 Files Changed 1308 +24 -18
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97e743407f - Show all commits

2
pub/bin/pages/pageChangelog.php
View File

@@ -2,7 +2,7 @@
<div class="card-body py-0 border"> <div class="card-body py-0 border">
<h5> <h5>
Sentri<br> Made by: Sentri<br> Made by:
<a class="text-decoration-none" href="https://marcomooij.net" target="_blank">Marco Mooij</a><br> Version 1.2.4 <a class="text-decoration-none" href="https://marcomooij.net" target="_blank">Marco Mooij</a><br> Version 1.3.0
</h5> </h5>
</div> </div>
</div> </div>

2
pub/bin/php/Classes/pageBuilder.php
View File

@@ -309,7 +309,7 @@ class pageBuilder
</nav> </nav>
<div class="copyright"> <div class="copyright">
<?php echo __('version') ?> <?php echo __('version') ?>
<a class="text-primary" href="/changelog/">1.2.4</a> <a class="text-primary" href="/changelog/">1.3.0</a>
</div> </div>
<div> <div>
<span class="navbar-text">Sentri</span> <span class="navbar-text">Sentri</span>

38
sql-update-1.3.sql
View File

@@ -14,23 +14,29 @@ VALUES ('f8cc7415-68a4-4827-a528-5d0ff3dea9b8',
'/office/pageTravelReimbursement.php', '/office/pageTravelReimbursement.php',
'/travelreimburse', '/travelreimburse',
'primary'); 'primary');
ALTER TABLE `system_settings` ALTER TABLE `system_settings`
ADD COLUMN `office_travelreimburse_howework_company` VARCHAR(36) NULL DEFAULT NULL AFTER `mail_smtp_pass`, ADD COLUMN `office_travelreimburse_cents_homework_incl` INT(3) NULL DEFAULT 23 AFTER `mail_smtp_pass`,
ADD COLUMN `office_travelreimburse_cents_homework_incl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_howework_company`,
ADD COLUMN `office_travelreimburse_cents_homework_excl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_cents_homework_incl`, ADD COLUMN `office_travelreimburse_cents_homework_excl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_cents_homework_incl`,
ADD COLUMN `office_travelreimburse_cents_business_incl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_cents_homework_excl`, ADD COLUMN `office_travelreimburse_cents_business_incl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_cents_homework_excl`,
ADD COLUMN `office_travelreimburse_cents_business_excl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_cents_business_incl`; ADD COLUMN `office_travelreimburse_cents_business_excl` INT(3) NULL DEFAULT 23 AFTER `office_travelreimburse_cents_business_incl`;
ALTER TABLE `system_settings`
CHANGE COLUMN `office_travelreimburse_cents_homework_incl` `office_travelreimburse_cents_homework_incl` INT (3) NULL DEFAULT NULL AFTER `office_travelreimburse_howework_company_name`, -- Dumping structure for table sentri.office_travelreimburse
CHANGE COLUMN `office_travelreimburse_cents_homework_excl` `office_travelreimburse_cents_homework_excl` INT (3) NULL DEFAULT NULL AFTER `office_travelreimburse_cents_homework_incl`, CREATE TABLE IF NOT EXISTS `office_travelreimburse` (
CHANGE COLUMN `office_travelreimburse_cents_business_incl` `office_travelreimburse_cents_business_incl` INT (3) NULL DEFAULT NULL AFTER `office_travelreimburse_cents_homework_excl`, `reimburse_uuid` char(36) NOT NULL,
CHANGE COLUMN `office_travelreimburse_cents_business_excl` `office_travelreimburse_cents_business_excl` INT (3) NULL DEFAULT NULL AFTER `office_travelreimburse_cents_business_incl`; `user_uuid` char(36) NOT NULL,
ALTER TABLE `office_travelreimburse` `departure_postcode` varchar(16) NOT NULL,
ADD COLUMN `company_name` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci' AFTER `company_uuid`; `destination_postcode` varchar(16) NOT NULL,
ALTER TABLE `office_travelreimburse` `travel_distance` int(3) NOT NULL DEFAULT 0,
CHANGE COLUMN `departure_postcode` `departure_postcode` VARCHAR (16) NOT NULL COLLATE 'utf8mb4_general_ci' AFTER `user_uuid`, `travel_date` date NOT NULL DEFAULT current_timestamp(),
CHANGE COLUMN `destination_postcode` `destination_postcode` VARCHAR (16) NOT NULL COLLATE 'utf8mb4_general_ci' AFTER `departure_postcode`, `travel_description` varchar(255) DEFAULT NULL,
CHANGE COLUMN `travel_distance` `travel_distance` INT (3) NOT NULL DEFAULT '0' AFTER `destination_postcode`, `office_travelreimburse_company_uuid` varchar(36) DEFAULT NULL,
CHANGE COLUMN `travel_description` `travel_description` VARCHAR (255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci' AFTER `travel_date`;+ `office_travelreimburse_company_name` varchar(32) DEFAULT NULL,
ALTER TABLE `system_settings` ADD CONSTRAINT `FK_system_settings_companies` FOREIGN KEY (`office_travelreimburse_howework_company_uuid`) REFERENCES `companies` (`company_uuid`) ON UPDATE NO ACTION ON DELETE NO ACTION; `homework` int(1) NOT NULL,
INSERT INTO `sentri`.`system_pages` (`page_uuid`, `module_uuid`, `page_name`, `page_description`, `page_location`, `page_url`, `page_color`) VALUES ('4a9b9bde-69b3-4928-b672-14c7effb1c2c', '46f0a6d8-21be-4f76-8a95-2e22be8f3878', 'configure_office', 'configure_office', '/portal-management/modules/pageModuleConfigureOffice.php', '/portal-management/modules/office', 'secondary'); PRIMARY KEY (`reimburse_uuid`),
KEY `user_uuid` (`user_uuid`),
KEY `FK_office_travelreimburse_companies` (`office_travelreimburse_company_uuid`) USING BTREE,
CONSTRAINT `FK_office_travelreimburse_companies` FOREIGN KEY (`office_travelreimburse_company_uuid`) REFERENCES `companies` (`company_uuid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `FK_office_travelreimburse_system_users` FOREIGN KEY (`user_uuid`) REFERENCES `system_users` (`user_uuid`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
UPDATE `sentri`.`system_pages` SET `page_name`='portal-management', `page_url`='/portal-management' WHERE `page_uuid`='558df250-d6bd-4b81-b23d-99b472b2c72a';