New Field for notifications so each user can get and dismiss their own notifications instead of them being shared

This commit is contained in:
johnnyq
2023-01-22 20:01:20 -05:00
parent b3f952b1f8
commit 13edae48dc
6 changed files with 23 additions and 15 deletions

View File

@@ -31,9 +31,9 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains
<!-- Notes --> <!-- Notes -->
<div class="col-9"> <div class="col-md-9">
<div class="card card-dark mb-5 elevation-3"> <div class="card card-dark mb-3 elevation-3">
<div class="card-header"> <div class="card-header">
<h5 class="card-title"><i class="fa fa-fw fa-edit mr-2"></i>Quick Notes</h5> <h5 class="card-title"><i class="fa fa-fw fa-edit mr-2"></i>Quick Notes</h5>
</div> </div>

View File

@@ -460,11 +460,18 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.0'"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.0'");
} }
//if(CURRENT_DATABASE_VERSION == '0.3.0'){ if(CURRENT_DATABASE_VERSION == '0.3.0'){
// Insert queries here required to update to DB version 0.3.1 mysqli_query($mysqli, "ALTER TABLE `notifications` ADD `notification_user_id` TINYINT(1) DEFAULT 0 AFTER `notification_client_id`");
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.1'");
}
//if(CURRENT_DATABASE_VERSION == '0.3.1'){
// Insert queries here required to update to DB version 0.3.2
// Then, update the database to the next sequential version // Then, update the database to the next sequential version
// mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.1'"); // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.2'");
//} //}

View File

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

6
db.sql
View File

@@ -722,6 +722,7 @@ CREATE TABLE `notifications` (
`notification_dismissed_at` datetime DEFAULT NULL, `notification_dismissed_at` datetime DEFAULT NULL,
`notification_dismissed_by` int(11) DEFAULT NULL, `notification_dismissed_by` int(11) DEFAULT NULL,
`notification_client_id` int(11) DEFAULT NULL, `notification_client_id` int(11) DEFAULT NULL,
`notification_user_id` tinyint(1) DEFAULT 0,
`company_id` int(11) NOT NULL, `company_id` int(11) NOT NULL,
PRIMARY KEY (`notification_id`) PRIMARY KEY (`notification_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
@@ -1066,7 +1067,7 @@ CREATE TABLE `settings` (
`config_ticket_from_name` varchar(200) DEFAULT NULL, `config_ticket_from_name` varchar(200) DEFAULT NULL,
`config_ticket_from_email` varchar(200) DEFAULT NULL, `config_ticket_from_email` varchar(200) DEFAULT NULL,
`config_ticket_email_parse` int(1) NOT NULL DEFAULT 0, `config_ticket_email_parse` int(1) NOT NULL DEFAULT 0,
`config_ticket_client_general_notifications` int(1) NOT NULL DEFAULT 0, `config_ticket_client_general_notifications` int(1) NOT NULL DEFAULT 1,
`config_enable_cron` tinyint(1) DEFAULT NULL, `config_enable_cron` tinyint(1) DEFAULT NULL,
`config_recurring_auto_send_invoice` tinyint(1) DEFAULT NULL, `config_recurring_auto_send_invoice` tinyint(1) DEFAULT NULL,
`config_enable_alert_domain_expire` tinyint(1) DEFAULT NULL, `config_enable_alert_domain_expire` tinyint(1) DEFAULT NULL,
@@ -1080,6 +1081,7 @@ CREATE TABLE `settings` (
`config_module_enable_itdoc` tinyint(1) NOT NULL DEFAULT 1, `config_module_enable_itdoc` tinyint(1) NOT NULL DEFAULT 1,
`config_module_enable_accounting` tinyint(1) NOT NULL DEFAULT 1, `config_module_enable_accounting` tinyint(1) NOT NULL DEFAULT 1,
`config_module_enable_ticketing` tinyint(1) NOT NULL DEFAULT 1, `config_module_enable_ticketing` tinyint(1) NOT NULL DEFAULT 1,
`config_theme` varchar(200) DEFAULT 'blue',
PRIMARY KEY (`company_id`) PRIMARY KEY (`company_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1517,4 +1519,4 @@ CREATE TABLE `vendors` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2023-01-18 20:12:49 -- Dump completed on 2023-01-22 20:00:27

View File

@@ -6,7 +6,7 @@ $location_phone = formatPhoneNumber($location_phone);
?> ?>
<div class="card mb-3"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-md"> <div class="col-md">

View File

@@ -167,15 +167,14 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
<div class='card-tools'> <div class='card-tools'>
<div class="float-left"> <div class="float-left">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
class="fas fa-fw fa-plus"></i> New Ticket <i class="fas fa-fw fa-plus"></i> New Ticket
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<form class="mb-4" autocomplete="off"> <form autocomplete="off">
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="input-group"> <div class="input-group">
@@ -206,7 +205,7 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
</div> </div>
</div> </div>
<div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { <div class="collapse <?php if (!empty($_GET['dtf'])) {
echo "show"; echo "show";
} ?>" id="advancedFilter"> } ?>" id="advancedFilter">
<div class="row"> <div class="row">
@@ -408,7 +407,7 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
</a> </a>
</td> </td>
<td> <td>
<a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a> <strong><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></strong>
</td> </td>
<td> <td>
<strong><a href="client_tickets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></strong> <strong><a href="client_tickets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></strong>