Skip to content

Commit 11eb680

Browse files
nolanpronolanpro
authored
Merge pull request #7935 from ProcessMaker/feature/FOUR-21566
Feature/FOUR-21566: Integrate dashboard development
2 parents c6e851f + b4e1969 commit 11eb680

31 files changed

Lines changed: 427 additions & 243 deletions

‎ProcessMaker/Http/Controllers/ProcessesCatalogueController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use ProcessMaker\Models\Process;
1414
use ProcessMaker\Models\ProcessCategory;
1515
use ProcessMaker\Models\ProcessLaunchpad;
16-
use ProcessMaker\Traits\HasControllerAddons;
1716
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
17+
use ProcessMaker\Traits\HasControllerAddons;
1818

1919
/**
2020
* @param Request $request
@@ -70,6 +70,7 @@ private function getDefaultSavedSearchId()
7070
);
7171
$id = $savedSearch->id;
7272
}
73+
7374
return $id;
7475
}
7576
}

‎ProcessMaker/Http/Controllers/TaskController.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ class TaskController extends Controller
4242

4343
public function index()
4444
{
45-
$title = 'To Do Tasks';
46-
47-
$showOldTaskScreen = Request::path() !== 'inbox';
45+
$routerPath = Request::route('router');
4846

47+
$title = 'To Do Tasks';
48+
$path = Request::path() !== 'inbox';
49+
$showOldTaskScreen = $path === true && $routerPath === null;
50+
$selectedProcess = $routerPath === null ? 'inbox' : 'reload';
4951
if (Request::input('status') == 'CLOSED') {
5052
$title = 'Completed Tasks';
5153
}
@@ -62,7 +64,9 @@ public function index()
6264

6365
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];
6466

65-
return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
67+
$currentUser = Auth::user();
68+
69+
return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen', 'currentUser', 'selectedProcess'));
6670
}
6771

6872
public function edit(ProcessRequestToken $task, string $preview = '')

‎ProcessMaker/Http/Middleware/GenerateMenus.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function handle(Request $request, Closure $next)
2828
$request_items->add(
2929
__('Home'),
3030
['route' => 'home', 'id' => 'home']
31-
)->active('home/*');
31+
)->active('home/*|inbox|inbox/*');
3232
});
3333
}
3434
$menu->group(['prefix' => 'processes'], function ($request_items) {

‎devhub/pm-font/svg/inbox.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎resources/fonts/pm-font/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.2</sup></h1>
115115
</div>
116116
<div class="icons">
117117
<ul>
118-
<li class="class-icon"><i class="fp-arrow-left"></i><p class="name">arrow-left</p></li><li class="class-icon"><i class="fp-box-arrow-up-right"></i><p class="name">box-arrow-up-right</p></li><li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
118+
<li class="class-icon"><i class="fp-arrow-left"></i><p class="name">arrow-left</p></li><li class="class-icon"><i class="fp-box-arrow-up-right"></i><p class="name">box-arrow-up-right</p></li><li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-inbox"></i><p class="name">inbox</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
119119
</ul>
120120
</div>
121121
<p class="links">

‎resources/fonts/pm-font/processmaker-font.css‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
@font-face {
22
font-family: "processmaker-font";
3-
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
4-
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
5-
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
6-
url("processmaker-font.woff?t=1738008776900") format("woff"),
7-
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
8-
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
3+
src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/
4+
src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */
5+
url("processmaker-font.woff2?t=1738184445914") format("woff2"),
6+
url("processmaker-font.woff?t=1738184445914") format("woff"),
7+
url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
8+
url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */
99
}
1010

1111
[class^="fp-"], [class*=" fp-"] {
@@ -45,19 +45,20 @@
4545
.fp-folder-outline:before { content: "\ea1b"; }
4646
.fp-fullscreen:before { content: "\ea1c"; }
4747
.fp-github:before { content: "\ea1d"; }
48-
.fp-layout-icon:before { content: "\ea1e"; }
49-
.fp-map:before { content: "\ea1f"; }
50-
.fp-mobile:before { content: "\ea20"; }
51-
.fp-pdf:before { content: "\ea21"; }
52-
.fp-play-outline:before { content: "\ea22"; }
53-
.fp-plus:before { content: "\ea23"; }
54-
.fp-screen-outline:before { content: "\ea24"; }
55-
.fp-script-outline:before { content: "\ea25"; }
56-
.fp-slack-notification:before { content: "\ea26"; }
57-
.fp-slack:before { content: "\ea27"; }
58-
.fp-slideshow:before { content: "\ea28"; }
59-
.fp-table:before { content: "\ea29"; }
60-
.fp-tachometer-alt-average:before { content: "\ea2a"; }
61-
.fp-trash:before { content: "\ea2b"; }
62-
.fp-unlink:before { content: "\ea2c"; }
48+
.fp-inbox:before { content: "\ea1e"; }
49+
.fp-layout-icon:before { content: "\ea1f"; }
50+
.fp-map:before { content: "\ea20"; }
51+
.fp-mobile:before { content: "\ea21"; }
52+
.fp-pdf:before { content: "\ea22"; }
53+
.fp-play-outline:before { content: "\ea23"; }
54+
.fp-plus:before { content: "\ea24"; }
55+
.fp-screen-outline:before { content: "\ea25"; }
56+
.fp-script-outline:before { content: "\ea26"; }
57+
.fp-slack-notification:before { content: "\ea27"; }
58+
.fp-slack:before { content: "\ea28"; }
59+
.fp-slideshow:before { content: "\ea29"; }
60+
.fp-table:before { content: "\ea2a"; }
61+
.fp-tachometer-alt-average:before { content: "\ea2b"; }
62+
.fp-trash:before { content: "\ea2c"; }
63+
.fp-unlink:before { content: "\ea2d"; }
6364

‎resources/fonts/pm-font/processmaker-font.eot‎

328 Bytes
Binary file not shown.

‎resources/fonts/pm-font/processmaker-font.less‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@font-face {font-family: "processmaker-font";
2-
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
3-
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
4-
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
5-
url("processmaker-font.woff?t=1738008776900") format("woff"),
6-
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
7-
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
2+
src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/
3+
src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */
4+
url("processmaker-font.woff2?t=1738184445914") format("woff2"),
5+
url("processmaker-font.woff?t=1738184445914") format("woff"),
6+
url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
7+
url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */
88
}
99

1010
[class^="fp-"], [class*=" fp-"] {
@@ -43,18 +43,19 @@
4343
.fp-folder-outline:before { content: "\ea1b"; }
4444
.fp-fullscreen:before { content: "\ea1c"; }
4545
.fp-github:before { content: "\ea1d"; }
46-
.fp-layout-icon:before { content: "\ea1e"; }
47-
.fp-map:before { content: "\ea1f"; }
48-
.fp-mobile:before { content: "\ea20"; }
49-
.fp-pdf:before { content: "\ea21"; }
50-
.fp-play-outline:before { content: "\ea22"; }
51-
.fp-plus:before { content: "\ea23"; }
52-
.fp-screen-outline:before { content: "\ea24"; }
53-
.fp-script-outline:before { content: "\ea25"; }
54-
.fp-slack-notification:before { content: "\ea26"; }
55-
.fp-slack:before { content: "\ea27"; }
56-
.fp-slideshow:before { content: "\ea28"; }
57-
.fp-table:before { content: "\ea29"; }
58-
.fp-tachometer-alt-average:before { content: "\ea2a"; }
59-
.fp-trash:before { content: "\ea2b"; }
60-
.fp-unlink:before { content: "\ea2c"; }
46+
.fp-inbox:before { content: "\ea1e"; }
47+
.fp-layout-icon:before { content: "\ea1f"; }
48+
.fp-map:before { content: "\ea20"; }
49+
.fp-mobile:before { content: "\ea21"; }
50+
.fp-pdf:before { content: "\ea22"; }
51+
.fp-play-outline:before { content: "\ea23"; }
52+
.fp-plus:before { content: "\ea24"; }
53+
.fp-screen-outline:before { content: "\ea25"; }
54+
.fp-script-outline:before { content: "\ea26"; }
55+
.fp-slack-notification:before { content: "\ea27"; }
56+
.fp-slack:before { content: "\ea28"; }
57+
.fp-slideshow:before { content: "\ea29"; }
58+
.fp-table:before { content: "\ea2a"; }
59+
.fp-tachometer-alt-average:before { content: "\ea2b"; }
60+
.fp-trash:before { content: "\ea2c"; }
61+
.fp-unlink:before { content: "\ea2d"; }

‎resources/fonts/pm-font/processmaker-font.module.less‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@font-face {font-family: "processmaker-font";
2-
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
3-
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
4-
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
5-
url("processmaker-font.woff?t=1738008776900") format("woff"),
6-
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
7-
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
2+
src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/
3+
src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */
4+
url("processmaker-font.woff2?t=1738184445914") format("woff2"),
5+
url("processmaker-font.woff?t=1738184445914") format("woff"),
6+
url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
7+
url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */
88
}
99

1010
[class^="fp-"], [class*=" fp-"] {
@@ -44,20 +44,21 @@
4444
.fp-folder-outline:before { content: "\ea1b"; }
4545
.fp-fullscreen:before { content: "\ea1c"; }
4646
.fp-github:before { content: "\ea1d"; }
47-
.fp-layout-icon:before { content: "\ea1e"; }
48-
.fp-map:before { content: "\ea1f"; }
49-
.fp-mobile:before { content: "\ea20"; }
50-
.fp-pdf:before { content: "\ea21"; }
51-
.fp-play-outline:before { content: "\ea22"; }
52-
.fp-plus:before { content: "\ea23"; }
53-
.fp-screen-outline:before { content: "\ea24"; }
54-
.fp-script-outline:before { content: "\ea25"; }
55-
.fp-slack-notification:before { content: "\ea26"; }
56-
.fp-slack:before { content: "\ea27"; }
57-
.fp-slideshow:before { content: "\ea28"; }
58-
.fp-table:before { content: "\ea29"; }
59-
.fp-tachometer-alt-average:before { content: "\ea2a"; }
60-
.fp-trash:before { content: "\ea2b"; }
61-
.fp-unlink:before { content: "\ea2c"; }
47+
.fp-inbox:before { content: "\ea1e"; }
48+
.fp-layout-icon:before { content: "\ea1f"; }
49+
.fp-map:before { content: "\ea20"; }
50+
.fp-mobile:before { content: "\ea21"; }
51+
.fp-pdf:before { content: "\ea22"; }
52+
.fp-play-outline:before { content: "\ea23"; }
53+
.fp-plus:before { content: "\ea24"; }
54+
.fp-screen-outline:before { content: "\ea25"; }
55+
.fp-script-outline:before { content: "\ea26"; }
56+
.fp-slack-notification:before { content: "\ea27"; }
57+
.fp-slack:before { content: "\ea28"; }
58+
.fp-slideshow:before { content: "\ea29"; }
59+
.fp-table:before { content: "\ea2a"; }
60+
.fp-tachometer-alt-average:before { content: "\ea2b"; }
61+
.fp-trash:before { content: "\ea2c"; }
62+
.fp-unlink:before { content: "\ea2d"; }
6263

6364
}

0 commit comments

Comments
 (0)