From 7b3b682fd3a41d1705ed88381d654abf92aca8f8 Mon Sep 17 00:00:00 2001
From: deadlocker8 <deadlocker@gmx.de>
Date: Thu, 3 Nov 2016 16:20:19 +0100
Subject: [PATCH] fixed wrong display of subtasks on index
---
js/main.js | 2 +-
php/admin/admin-roadmaps.php | 3 +--
php/index.php | 8 ++++----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/js/main.js b/js/main.js
index 5b4ad68..7fd4c4e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -460,7 +460,7 @@ function editSubtask(subtask_ID, task_ID)
$.post('../admin/helper/edit-subtask.php',
{
"title": title,
- "de6scription": description,
+ "description": description,
"done": done,
"edit": edit,
"ID": subtask_ID,
diff --git a/php/admin/admin-roadmaps.php b/php/admin/admin-roadmaps.php
index 3bef775..0131651 100644
--- a/php/admin/admin-roadmaps.php
+++ b/php/admin/admin-roadmaps.php
@@ -65,8 +65,7 @@ $db->createTables();
if($roadmaps == false)
{
- header('Location: ../error.php?message=error_database_connection');
- exit;
+ echo '<td colspan="2" class="center-align">No Roadmaps</td>';
}
else
{
diff --git a/php/index.php b/php/index.php
index 7d9ff78..546b225 100644
--- a/php/index.php
+++ b/php/index.php
@@ -271,7 +271,7 @@ function printMilestoneIndevWithTasks($currentMilestone, $db, $tasks, $color, $l
else
{
$numberOfOpenTasks = $numberOfOpenTasks['count'];
- $percentage = ($numberOfOpenTasks / sizeof($tasks))*100;
+ $percentage = ((sizeof($tasks) - $numberOfOpenTasks) / sizeof($tasks))*100;
$percentage = round($percentage);
echo '<div class="card padding white milestone">' .
@@ -342,17 +342,17 @@ function printSubTasksDone($currentTask, $subtasks, $db)
else
{
$numberOfOpenSubtasks = $numberOfOpenSubtasks['count'];
- if($numberOfOpenSubtasks == sizeof($subtasks))
+ if($numberOfOpenSubtasks == 0)
{
echo '<li>' .
- '<div class="collapsible-header bold"><i class="material-icons green-text">check</i>Layout<span class="right">' . $numberOfOpenSubtasks . '/' . sizeof($subtasks) . '</span></div>' .
+ '<div class="collapsible-header bold"><i class="material-icons green-text">check</i>'.$currentTask['Title'].'<span class="right">' . (sizeof($subtasks) - $numberOfOpenSubtasks) . '/' . sizeof($subtasks) . '</span></div>' .
'<div class="collapsible-body">' .
'<ul class="collapsible white margin-left-and-right no-shadow margin-top-and-bottom" data-collapsible="accordion">';
}
else
{
echo '<li>' .
- '<div class="collapsible-header bold"><i class="material-icons red-text">build</i>Layout<span class="right">' . $numberOfOpenSubtasks . '/' . sizeof($subtasks) . '</span></div>' .
+ '<div class="collapsible-header bold"><i class="material-icons red-text">build</i>'.$currentTask['Title'].'<span class="right">' . (sizeof($subtasks) - $numberOfOpenSubtasks) . '/' . sizeof($subtasks) . '</span></div>' .
'<div class="collapsible-body">' .
'<ul class="collapsible white margin-left-and-right no-shadow margin-top-and-bottom" data-collapsible="accordion">';
}
--
GitLab