mirror of
https://github.com/itflow-org/itflow
synced 2026-03-06 13:54:51 +00:00
Projects
- Add archive and unarchive ability - Improve logic around Open > Close > Archive > Delete - Change to new perms system - Tidy and formatting - TODO: CSRF
This commit is contained in:
@@ -50,7 +50,7 @@ if (isset($_GET['project_id'])) {
|
|||||||
$project_manager_display = "-";
|
$project_manager_display = "-";
|
||||||
}
|
}
|
||||||
|
|
||||||
if($project_completed_at) {
|
if ($project_completed_at) {
|
||||||
$project_status_display = "<span class='badge badge-pill badge-dark ml-2'>Closed</span>";
|
$project_status_display = "<span class='badge badge-pill badge-dark ml-2'>Closed</span>";
|
||||||
$project_completed_date_display = "<div class='text-primary text-bold'><small><i class='fa fa-fw fa-door-closed mr-2'></i>" . date('Y-m-d', strtotime($project_completed_at)) . "</small></div>";
|
$project_completed_date_display = "<div class='text-primary text-bold'><small><i class='fa fa-fw fa-door-closed mr-2'></i>" . date('Y-m-d', strtotime($project_completed_at)) . "</small></div>";
|
||||||
} else {
|
} else {
|
||||||
@@ -96,7 +96,7 @@ if (isset($_GET['project_id'])) {
|
|||||||
$completed_task_count = mysqli_num_rows($sql_tasks_completed);
|
$completed_task_count = mysqli_num_rows($sql_tasks_completed);
|
||||||
|
|
||||||
// Tasks Completed Percent
|
// Tasks Completed Percent
|
||||||
if($task_count) {
|
if ($task_count) {
|
||||||
$tasks_completed_percent = round(($completed_task_count / $task_count) * 100);
|
$tasks_completed_percent = round(($completed_task_count / $task_count) * 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,16 +124,16 @@ if (isset($_GET['project_id'])) {
|
|||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!-- Breadcrumbs-->
|
<!-- Breadcrumbs-->
|
||||||
<ol class="breadcrumb d-print-none">
|
<ol class="breadcrumb d-print-none">
|
||||||
<li class="breadcrumb-item">
|
<li class="breadcrumb-item">
|
||||||
<a href="projects.php">Projects</a>
|
<a href="projects.php">Projects</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="breadcrumb-item active">Project Details</li>
|
<li class="breadcrumb-item active">Project Details</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
<!-- Project Header -->
|
<!-- Project Header -->
|
||||||
<div class="card card-body">
|
<div class="card card-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-3">
|
<div class="col-sm-3">
|
||||||
<div class="media">
|
<div class="media">
|
||||||
@@ -158,19 +158,19 @@ if (isset($_GET['project_id'])) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-3">
|
<div class="col-sm-3">
|
||||||
<?php if($ticket_count) { ?>
|
<?php if ($ticket_count) { ?>
|
||||||
<div class="progress" style="height: 20px;">
|
<div class="progress" style="height: 20px;">
|
||||||
<i class="fa fas fa-fw fa-life-ring mr-2"></i>
|
<i class="fa fas fa-fw fa-life-ring mr-2"></i>
|
||||||
<div class="progress-bar bg-primary" style="width: <?php echo $tickets_closed_percent; ?>%;"><?php echo $closed_ticket_count; ?> / <?php echo $ticket_count; ?></div>
|
<div class="progress-bar bg-primary" style="width: <?php echo $tickets_closed_percent; ?>%;"><?php echo $closed_ticket_count; ?> / <?php echo $ticket_count; ?></div>
|
||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if($task_count) { ?>
|
<?php if ($task_count) { ?>
|
||||||
<div class="progress mt-2" style="height: 20px;">
|
<div class="progress mt-2" style="height: 20px;">
|
||||||
<i class="fa fas fa-fw fa-tasks mr-2"></i>
|
<i class="fa fas fa-fw fa-tasks mr-2"></i>
|
||||||
<div class="progress-bar bg-secondary" style="width: <?php echo $tasks_completed_percent; ?>%;"><?php echo $completed_task_count; ?> / <?php echo $task_count; ?></div>
|
<div class="progress-bar bg-secondary" style="width: <?php echo $tasks_completed_percent; ?>%;"><?php echo $completed_task_count; ?> / <?php echo $task_count; ?></div>
|
||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if($ticket_collaborators) { ?>
|
<?php if ($ticket_collaborators) { ?>
|
||||||
<div class=mt-1>
|
<div class=mt-1>
|
||||||
<i class="fas fa-fw fa-users mr-2 text-secondary"></i><?php echo $ticket_collaborators; ?>
|
<i class="fas fa-fw fa-users mr-2 text-secondary"></i><?php echo $ticket_collaborators; ?>
|
||||||
</div>
|
</div>
|
||||||
@@ -183,7 +183,8 @@ if (isset($_GET['project_id'])) {
|
|||||||
<a class="btn btn-primary btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
|
<a class="btn btn-primary btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
|
||||||
<i class="fas fa-fw fa-check mr-2"></i>Close
|
<i class="fas fa-fw fa-check mr-2"></i>Close
|
||||||
</a>
|
</a>
|
||||||
<?php } if (empty($project_completed_at)) { ?>
|
<?php } ?>
|
||||||
|
<?php if (empty($project_completed_at)) { ?>
|
||||||
<button type="button" class="btn btn-primary btn-sm" href="#" data-toggle="modal" data-target="#addProjectTicketModal">
|
<button type="button" class="btn btn-primary btn-sm" href="#" data-toggle="modal" data-target="#addProjectTicketModal">
|
||||||
<i class="fas fa-fw fa-plus mr-2"></i>Add Ticket
|
<i class="fas fa-fw fa-plus mr-2"></i>Add Ticket
|
||||||
</button>
|
</button>
|
||||||
@@ -193,7 +194,7 @@ if (isset($_GET['project_id'])) {
|
|||||||
<i class="fas fa-fw fa-ellipsis-v"></i>
|
<i class="fas fa-fw fa-ellipsis-v"></i>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<?php if(empty($project_completed_at)) { ?>
|
<?php if (empty($project_completed_at)) { ?>
|
||||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProjectModal<?php echo $project_id; ?>">
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProjectModal<?php echo $project_id; ?>">
|
||||||
<i class="fas fa-fw fa-edit mr-2"></i>Edit
|
<i class="fas fa-fw fa-edit mr-2"></i>Edit
|
||||||
</a>
|
</a>
|
||||||
@@ -214,9 +215,9 @@ if (isset($_GET['project_id'])) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-8">
|
<div class="col-md-8">
|
||||||
|
|
||||||
<!-- Tickets card -->
|
<!-- Tickets card -->
|
||||||
@@ -381,7 +382,7 @@ if (isset($_GET['project_id'])) {
|
|||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<?php if($task_completed_at) { ?>
|
<?php if ($task_completed_at) { ?>
|
||||||
<i class="far fa-fw fa-check-square text-primary mr-3"></i>
|
<i class="far fa-fw fa-check-square text-primary mr-3"></i>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<a href="post.php?complete_task=<?php echo $task_id; ?>">
|
<a href="post.php?complete_task=<?php echo $task_id; ?>">
|
||||||
@@ -399,12 +400,12 @@ if (isset($_GET['project_id'])) {
|
|||||||
|
|
||||||
</div> <!-- End col-3 -->
|
</div> <!-- End col-3 -->
|
||||||
|
|
||||||
</div> <!-- End row -->
|
</div> <!-- End row -->
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once "project_edit_modal.php";
|
require_once "project_edit_modal.php";
|
||||||
require_once "project_ticket_add_modal.php";
|
require_once "project_ticket_add_modal.php";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user