diff --git a/app/Controller/EasycasesController.php b/app/Controller/EasycasesController.php index 3ef9578..8c4ea92 100644 --- 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 index cfad4f1..3a2a15a 100644 --- a/app/View/Easycase/admin_mydashboard.ctp +++ b/app/View/Easycase/admin_mydashboard.ctp @@ -295,7 +295,7 @@
-

+

diff --git a/app/View/Elements/top_bar_v2.ctp b/app/View/Elements/top_bar_v2.ctp index d01e2e9..52ef4f2 100644 --- a/app/View/Elements/top_bar_v2.ctp +++ b/app/View/Elements/top_bar_v2.ctp @@ -1605,6 +1605,15 @@ + Format->isAllowed('View Kanban', $roleAccess)) { ?> +
  • > + + Format->displayKanbanOrBoard();//__('Kanban');?> + +
  • + Format->isAllowed('View Calendar', $roleAccess)) { ?>
  • ', 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, '', 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\":\"0\",\"a_tooltip\":\"\"}', '2020-01-10 00:00:00', '2020-01-10 00:00:00'), (42, 38, 'Archive', 1, 0, '', 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, '', 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, 'alternate_email', 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` --