kanban view added with dashboard page issue fixation

Orangescrum · Sep 29, 2022 · 3c39c69 · 3c39c69
1 parent 3fb85ea
commit 3c39c69
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/app/Controller/EasycasesController.php b/app/Controller/EasycasesController.php
@@ -13388,7 +13388,6 @@ public function project_status($args = null)
                 . "AND Easycase.project_id!=0 " . $projQry . " "
                 . "GROUP BY Easycase.custom_status_id, if(Easycase.type_id=10,10,Easycase.legend)";
         $common_qry = $this->Easycase->query($sql);
-
         $csts_arr = array();
         $status = array();
         if ($common_qry) {
@@ -13403,7 +13402,7 @@ public function project_status($args = null)
         }
         //always custom status should start after 20 auto increment id for above
         //$status = Hash::combine($common_qry, '{n}.0.legend', '{n}.0.tot_count');
-
+        
         $total = array_sum($status);
         $extra = $this->data['extra'];
         $this->set(compact('status', 'total', 'fragment', 'extra', 'common_qry', 'csts_arr'));
@@ -13443,6 +13442,7 @@ public function project_status($args = null)
                         $json_data['data'][$i]['name'] = $legend[$val[0]['legend']];
                         $json_data['data'][$i]['y'] = $val[0]['tot_count'];
                         $json_data['data'][$i]['color'] = $color[$val[0]['legend']];
+                        $i++;
                     }
                     //$i++;
                 }

diff --git a/app/View/Easycase/admin_mydashboard.ctp b/app/View/Easycase/admin_mydashboard.ctp
@@ -295,7 +295,7 @@
         <div class="col-lg-6">
             <div class="width100 cmn_bdr_shadow dash-pwrs">
                 <div class="top_ttl_box">
-                    <h2><a href="<?php echo HTTP_ROOT . 'resource-utilization'; ?>" onclick="return trackEventLeadTracker('Admin Dashboard','Project wise Resource Utilization','<?php echo $_SESSION['SES_EMAIL_USER_LOGIN']; ?>');"><?php echo __('Project wise Resource Utilization');?></a></h2>
+                    <h2><a href="" onclick=""><?php echo __('Project wise Resource Utilization');?></a></h2>
                 </div>
                 <!--<div class="loader_dv_db" id="project_resource_utilization_ldr" style="display: none;margin-top: 90px;"><center><img src="<?php echo HTTP_IMAGES; ?>images/case_loader2.gif" alt="Loading..." title="Loading..." /></center></div>-->
                 <div id="project_resource_utilization" class="project-utilization">

diff --git a/app/View/Elements/top_bar_v2.ctp b/app/View/Elements/top_bar_v2.ctp
@@ -1605,6 +1605,15 @@
 											<i class="material-icons">&#xE8EF;</i> <?php echo __('Task List');?>
 										</a>
 									</li>
+									<?php if ($this->Format->isAllowed('View Kanban', $roleAccess)) { ?>
+									<li class="kanban_breadcrumb_v2 hide-in-scrum" id="tour_kanban_view" <?php if ($_SESSION['project_methodology'] == 'scrum') {
+											echo "style='display:none;'"; }?>>
+										<a href="<?php echo HTTP_ROOT; ?>dashboard#/kanban"
+											onclick="trackEventLeadTracker('Breadcrumb Navigation','Kanban','<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>');return checkHashLoad('kanban');">
+											<i class="material-icons">&#xE8F0;</i> <?php echo $this->Format->displayKanbanOrBoard();//__('Kanban');?>
+										</a>
+									</li>
+									<?php } ?>
 									<?php if ($this->Format->isAllowed('View Calendar', $roleAccess)) { ?>
 									<li class="calendar_breadcrumb_v2" id="tour_calendar_view">
 										<a href="<?php echo HTTP_ROOT; ?>dashboard#/calendar"

diff --git a/app/webroot/js/script_v1.js b/app/webroot/js/script_v1.js
@@ -13561,7 +13561,7 @@ function showTasks(arg) {
         createCookie("CURRENT_FILTER", 'cases', 365, DOMAIN_COOKIE);
     } else if (arg == 'activities') {
         var prjunid = $('#pname_dashboard_hid').val();
-        if (prjunid.toLowerCase() == 'all') {
+        if (prjunid != undefined && prjunid.toLowerCase() == 'all') {
             showTopErrSucc('error', _('Oops! You are in') + " " + _('All') + " " + _('project. Please choose a project.'));
             return false;
         } else {

diff --git a/database.sql b/database.sql
@@ -1978,6 +1978,7 @@ INSERT INTO `menus` (`id`, `parent_id`, `name`, `is_active`, `menu_type`, `menu_
 (38, 0, 'More', 1, 0, '<i class=\"left-menu-icon material-icons\">&#xE53B;</i>', 9, 1, 0, '{\"url\":\"#\",\"li_id\":\"\",\"a_id\":\"\",\"li_class\":\"\",\"a_class\":\"\",\"a_click\":\"\",\"li_click\":\"\",\"cnt_span\":\"\",\"a_tooltip\":\"\"}', '2020-01-10 00:00:00', '2020-01-10 00:00:00'),
 (39, 38, 'Files', 1, 0, '<i class=\"left-menu-icon material-icons\">&#xE53B;</i>', 4, 1, 0, '{\"url\":\"dashboard#files\",\"li_id\":\"\",\"a_id\":\"\",\"li_class\":\"menu-files\",\"a_class\":\"menu-files\",\"a_click\":\"return checkHashLoad(\'files\');\",\"li_click\":\"\",\"cnt_span\":\"<span class=\'cmn_count_no\' id=\'fileCnt\' style=\'\'>0</span>\",\"a_tooltip\":\"\"}', '2020-01-10 00:00:00', '2020-01-10 00:00:00'),
 (42, 38, 'Archive', 1, 0, '<i class=\"left-menu-icon material-icons\">&#xE53B;</i>', 7, 1, 0, '{\"url\":\"archives/listall#caselist\",\"li_id\":\"\",\"a_id\":\"\",\"li_class\":\"\",\"a_class\":\"\",\"a_click\":\"\",\"li_click\":\"\",\"cnt_span\":\"\",\"a_tooltip\":\"\"}', '2020-01-10 00:00:00', '2020-01-10 00:00:00'),
+(46, 38, 'Kanban', 1, 0, '<i class=\"left-menu-icon material-icons\">&#xE8F0;</i>', 2, 1, 0, '{\"url\":\"dashboard#/milestonelist\",\"li_id\":\"\",\"a_id\":\"\",\"li_class\":\"\",\"a_class\":\"\",\"a_click\":\"\",\"li_click\":\"\",\"cnt_span\":\"\",\"a_tooltip\":\"\"}\n', '2020-01-10 00:00:00', '2020-01-10 00:00:00'),
 (57, 0, 'Mention', 1, 0, '<i class=\"left-menu-icon material-icons\">alternate_email</i>', 2, 1, 0, '{\"url\":\"dashboard#mentioned_list\",\"li_id\":\"\",\"a_id\":\"left_menu_nav_tour\",\"li_class\":\"caseMenuLeft menu-mention \",\"a_class\":\"\",\"a_click\":\"return checkHashLoad(\'mentioned_list\');\",\"li_click\":\"\",\"cnt_span\":\"\",\"a_tooltip\":\"\"}', '2020-11-06 12:53:49', '2020-11-06 12:53:49');
 
 -- --------------------------------------------------------
@@ -4287,6 +4288,11 @@ ALTER TABLE `custom_filters`
 --
 ALTER TABLE `custom_statuses`
   ADD PRIMARY KEY (`id`);
+--
+-- Indexes for table `easycase_mentions`
+--
+ALTER TABLE `easycase_mentions`
+  ADD PRIMARY KEY (`id`);
 
 --
 -- Indexes for table `dailyupdate_notifications`
@@ -5294,7 +5300,11 @@ ALTER TABLE `modules`
 --
 ALTER TABLE `new_pricing_users`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
-
+--
+-- AUTO_INCREMENT for table `easycase_mentions`
+--
+ALTER TABLE `easycase_mentions`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 --
 -- AUTO_INCREMENT for table `notifications`
 --