AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add scheduled ticket end date field" 

This reverts commit d81a04a1d4.
This commit is contained in:
Andrew Malsbury 2023-11-22 17:45:01 +00:00
parent d81a04a1d4
commit d90280011f
8 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
database_updates.php
View File

@ -1510,24 +1510,6 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
// Then, update the database to the next sequential version
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.6'");
}
if (CURRENT_DATABASE_VERSION == '0.9.6') {
mysqli_query($mysqli, "ALTER TABLE `scheduled_tickets` ADD `scheduled_ticket_end_date` DATE NOT NULL AFTER `scheduled_ticket_next_run`");
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.7'");
}
// Be sure to change database_version.php to reflect the version you are updating to here
// Please add this same comment block to the bottom of this file, and update the version number.
// Uncomment Below Lines, to add additional database updates
//
// if (CURRENT_DATABASE_VERSION == '0.9.7') {
// // Insert queries here required to update to DB version 0.9.8
//
// // Then, update the database to the next sequential version
// mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.8'");
// }
} else {
// Up-to-date
}

2
database_version.php
View File

@ -5,5 +5,5 @@
* It is used in conjunction with database_updates.php
*/
DEFINE("LATEST_DATABASE_VERSION", "0.9.7");
DEFINE("LATEST_DATABASE_VERSION", "0.9.6");

1
db.sql
View File

@ -1077,7 +1077,6 @@ CREATE TABLE `scheduled_tickets` (
`scheduled_ticket_frequency` varchar(10) NOT NULL,
`scheduled_ticket_start_date` date NOT NULL,
`scheduled_ticket_next_run` date NOT NULL,
`scheduled_ticket_end_date` date NOT NULL,
`scheduled_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(),
`scheduled_ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
`scheduled_ticket_created_by` int(11) NOT NULL DEFAULT 0,

1
js/scheduled_tickets_edit_modal.js
View File

@ -20,7 +20,6 @@ function populateScheduledTicketEditModal(client_id, ticket_id) {
document.getElementById("editClientId").value = client_id;
document.getElementById("editTicketSubject").value = ticket.scheduled_ticket_subject;
document.getElementById("editTicketNextRun").value = ticket.scheduled_ticket_next_run;
document.getElementById("editTicketEndDate").value = ticket.scheduled_ticket_end_date;
tinyMCE.get('editTicketDetails').setContent(ticket.scheduled_ticket_details);
// Contact dropdown

5
post/scheduled_ticket_model.php
View File

@ -23,8 +23,3 @@ $contact_id = "0";
if (isset($_POST['contact'])) {
$contact_id = intval($_POST['contact']);
}
$end_date = NULL;
if (isset($_POST['end_date'])) {
$end_date = sanitizeInput($_POST['end_date']);
}

4
post/ticket.php
View File

@ -941,7 +941,7 @@ if (isset($_POST['add_scheduled_ticket'])) {
}
// Add scheduled ticket
mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_end_date = '$end_date', scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id");
mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id");
$scheduled_ticket_id = mysqli_insert_id($mysqli);
@ -971,7 +971,7 @@ if (isset($_POST['edit_scheduled_ticket'])) {
}
// Edit scheduled ticket
mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_end_date = '$end_date', scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id");
mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id");
// Logging
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Scheduled Ticket', log_action = 'Modify', log_description = '$session_name modified scheduled ticket for $subject - $frequency', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id");

10
scheduled_ticket_add_modal.php
View File

@ -99,16 +99,6 @@
</div>
</div>
<div class="form-group">
<label>Ending date <strong class="text-danger"></strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
</div>
<input class="form-control" type="date" name="end_date" min="<?php echo date("Y-m-d"); ?>" max="2999-12-31" required>
</div>
</div>
<div class="form-group">
<label>Priority <strong class="text-danger">*</strong></label>
<div class="input-group">

10
scheduled_ticket_edit_modal.php
View File

@ -51,16 +51,6 @@
</div>
</div>
<div class="form-group">
<label>Ending Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
</div>
<input class="form-control" type="date" name="end_date" id="editTicketEndDate" max="2999-12-31">
</div>
</div>
<div class="form-group">
<label>Priority <strong class="text-danger">*</strong></label>
<div class="input-group">