FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmPaulis merged 1 commit into from
Sep 20, 2024
Merged

FOUR-18970: Create the view for show the summary related to the case - History Tab #7395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 152 additions & 1 deletion ProcessMaker/Http/Controllers/CasesController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
/**
* Cases Detail
*
* @param ProcessRequest $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit(ProcessRequest $request)
{
return view('cases.edit');
if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
$startEvent = $request->tokens()->orderBy('id')->first();
if ($startEvent) {
$definition = $startEvent->getDefinition();
$allowInterstitial = false;
if (isset($definition['allowInterstitial'])) {
$allowInterstitial = filter_var(
$definition['allowInterstitial'],
FILTER_VALIDATE_BOOLEAN,
FILTER_NULL_ON_FAILURE
);
}
if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
$active = $request->tokens()
->where('user_id', Auth::id())
->where('element_type', 'task')
->where('status', 'ACTIVE')
->orderBy('id')->first();

// If the interstitial is enabled on the start event, then use it as the task
if ($active) {
$task = $allowInterstitial ? $startEvent : $active;
} else {
$task = $startEvent;
}

return redirect(route('tasks.edit', [
'task' => $task->getKey(),
]));
}
}
}

$userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
->where('commentable_id', $request->id)
->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
->count() > 0;

$requestMedia = $request->media()->get()->pluck('id');

$userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
->whereIn('commentable_id', $requestMedia)
->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
->count() > 0;

if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
$this->authorize('view', $request);
}

$request->participants;
$request->user;
$request->summary = $request->summary();

if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
$request->summary_screen = $request->process->cancelScreen;
} else {
$request->summary_screen = $request->getSummaryScreen();
}
$request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

$canCancel = Auth::user()->can('cancel', $request->processVersion);
$canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
$canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
$canRetry = false;

if ($canManuallyComplete) {
$retry = RetryProcessRequest::for($request);

$canRetry = $retry->hasRetriableTasks() &&
!$retry->hasNonRetriableTasks() &&
!$retry->isChildRequest();
}

$files = \ProcessMaker\Models\Media::getFilesRequest($request);

$canPrintScreens = $this->canUserPrintScreen($request);

$manager = app(ScreenBuilderManager::class);
event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

$addons = [];
$dataActionsAddons = [];

$isProcessManager = $request->process?->manager_id === Auth::user()->id;

$eligibleRollbackTask = null;
$errorTask = RollbackProcessRequest::getErrorTask($request);
if ($errorTask) {
$eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
}
$this->summaryScreenTranslation($request);
return view('cases.edit', compact(
'request',
'files',
'canCancel',
'canViewComments',
'canManuallyComplete',
'canRetry',
'manager',
'canPrintScreens',
'addons',
'isProcessManager',
'eligibleRollbackTask',
'errorTask',
));
}

/**
* the user may or may not print forms
*
* @param ProcessRequest $request
* @return bool
*/
private function canUserPrintScreen(ProcessRequest $request)
{
//validate user is administrator
if (Auth::user()->is_administrator) {
return true;
}

//validate user is participant or requester
if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
return true;
}

// Any user with permissions Edit Request Data, Edit Task Data and view All Requests
if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
return true;
}

return false;
}

/**
* Translates the summary screen strings
* @param ProcessRequest $request
* @return void
*/
public function summaryScreenTranslation(ProcessRequest $request): void
{
if ($request->summary_screen) {
$processTranslation = new ProcessTranslation($request->process);
$translatedConf = $processTranslation->applyTranslations($request->summary_screen);
$request->summary_screen['config'] = $translatedConf;
}
}
}
9 changes: 9 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/data.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;
3 changes: 2 additions & 1 deletion resources/jscomposition/cases/casesDetail/components/CaseDetail.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
},
{
name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
},
{
name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down
36 changes: 36 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/TabHistory.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
<div class="tw-flex tw-flex-col tw-gap-2">
<span>{{ processName }}</span>
<TimeLine
:commentable_id="commentableId"
:commentable_type="comentableType"
:adding="false"
:readonly="status === 'COMPLETED'"
:timeline="false"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
components: { TimeLine },
setup() {
const status = ref(getRequestStatus());
const commentableId = ref(getRequestId());
const comentableType = ref(getComentableType());
const processName = ref(getProcessName());
return {
status,
commentableId,
comentableType,
processName,
};
},
});
</script>
2 changes: 1 addition & 1 deletion resources/jscomposition/cases/casesDetail/config/columns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-18970: Create the view for show the summary related to the case - History Tab#7395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 1 commit into

from

Sep 20, 2024
 Merged


FOUR-18970: Create the view for show the summary related to the case - History Tab
#7395
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


153 changes: 152 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,159 @@ public function index($type = null)
 // This is a temporary API the engine team will provide the new
 return view('cases.casesMain');
 }
 /**
 * Cases Detail
 *
 * @param ProcessRequest $request
 *
 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 */
 public function edit(ProcessRequest $request)
 {
 return view('cases.edit');
 if (!request()->input('skipInterstitial') && $request->status === 'ACTIVE') {
 $startEvent = $request->tokens()->orderBy('id')->first();
 if ($startEvent) {
 $definition = $startEvent->getDefinition();
 $allowInterstitial = false;
 if (isset($definition['allowInterstitial'])) {
 $allowInterstitial = filter_var(
 $definition['allowInterstitial'],
 FILTER_VALIDATE_BOOLEAN,
 FILTER_NULL_ON_FAILURE
 );
 }
 if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
 $active = $request->tokens()
 ->where('user_id', Auth::id())
 ->where('element_type', 'task')
 ->where('status', 'ACTIVE')
 ->orderBy('id')->first();

 // If the interstitial is enabled on the start event, then use it as the task
 if ($active) {
 $task = $allowInterstitial ? $startEvent : $active;
 } else {
 $task = $startEvent;
 }

 return redirect(route('tasks.edit', [
 'task' => $task->getKey(),
 ]));
 }
 }
 }

 $userHasCommentsForRequest = Comment::where('commentable_type', ProcessRequest::class)
 ->where('commentable_id', $request->id)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 $requestMedia = $request->media()->get()->pluck('id');

 $userHasCommentsForMedia = Comment::where('commentable_type', \ProcessMaker\Models\Media::class)
 ->whereIn('commentable_id', $requestMedia)
 ->where('body', 'like', '%{{' . \Auth::user()->id . '}}%')
 ->count() > 0;

 if (!$userHasCommentsForMedia && !$userHasCommentsForRequest) {
 $this->authorize('view', $request);
 }

 $request->participants;
 $request->user;
 $request->summary = $request->summary();

 if ($request->status === 'CANCELED' && $request->process->cancel_screen_id) {
 $request->summary_screen = $request->process->cancelScreen;
 } else {
 $request->summary_screen = $request->getSummaryScreen();
 }
 $request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);

 $canCancel = Auth::user()->can('cancel', $request->processVersion);
 $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);
 $canManuallyComplete = Auth::user()->is_administrator && $request->status === 'ERROR';
 $canRetry = false;

 if ($canManuallyComplete) {
 $retry = RetryProcessRequest::for($request);

 $canRetry = $retry->hasRetriableTasks() &&
 !$retry->hasNonRetriableTasks() &&
 !$retry->isChildRequest();
 }

 $files = \ProcessMaker\Models\Media::getFilesRequest($request);

 $canPrintScreens = $this->canUserPrintScreen($request);

 $manager = app(ScreenBuilderManager::class);
 event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));

 $addons = [];
 $dataActionsAddons = [];

 $isProcessManager = $request->process?->manager_id === Auth::user()->id;

 $eligibleRollbackTask = null;
 $errorTask = RollbackProcessRequest::getErrorTask($request);
 if ($errorTask) {
 $eligibleRollbackTask = RollbackProcessRequest::eligibleRollbackTask($errorTask);
 }
 $this->summaryScreenTranslation($request);
 return view('cases.edit', compact(
 'request',
 'files',
 'canCancel',
 'canViewComments',
 'canManuallyComplete',
 'canRetry',
 'manager',
 'canPrintScreens',
 'addons',
 'isProcessManager',
 'eligibleRollbackTask',
 'errorTask',
 ));
 }

 /**
 * the user may or may not print forms
 *
 * @param ProcessRequest $request
 * @return bool
 */
 private function canUserPrintScreen(ProcessRequest $request)
 {
 //validate user is administrator
 if (Auth::user()->is_administrator) {
 return true;
 }

 //validate user is participant or requester
 if (in_array(Auth::user()->id, $request->participants()->get()->pluck('id')->toArray())) {
 return true;
 }

 // Any user with permissions Edit Request Data, Edit Task Data and view All Requests
 if (Auth::user()->can('view-all_requests') && Auth::user()->can('edit-request_data') && Auth::user()->can('edit-task_data')) {
 return true;
 }

 return false;
 }

 /**
 * Translates the summary screen strings
 * @param ProcessRequest $request
 * @return void
 */
 public function summaryScreenTranslation(ProcessRequest $request): void
 {
 if ($request->summary_screen) {
 $processTranslation = new ProcessTranslation($request->process);
 $translatedConf = $processTranslation->applyTranslations($request->summary_screen);
 $request->summary_screen['config'] = $translatedConf;
 }
 }
}

9 changes: 9 additions & 0 deletions
resources/jscomposition/cases/casesDetail/api/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
export default {};

export const getRequestId = () => requestId;

export const getRequestStatus = () => request.status;

export const getComentableType = () => comentable_type;

export const getProcessName = () => request.process.name;

3 changes: 2 additions & 1 deletion
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";
import TabHistory from "./TabHistory.vue";

export default defineComponent({
 components: { Tabs },
Expand All@@ -34,7 +35,7 @@ export default defineComponent({
 name: translate.t("File Manager"), href: "#file_manager", current: "file_manager", show: false, content: "",
 },
 {
 name: translate.t("History"), href: "#history", current: "history", show: true, content: "",
 name: translate.t("History"), href: "#history", current: "history", show: true, content: TabHistory,
 },
 {
 name: translate.t("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
Expand Down

36 changes: 36 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/TabHistory.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
<template>
 <div class="tw-flex tw-flex-col tw-gap-2">
 <span>{{ processName }}</span>
 <TimeLine
 :commentable_id="commentableId"
 :commentable_type="comentableType"
 :adding="false"
 :readonly="status === 'COMPLETED'"
 :timeline="false"
 />
 </div>
</template>

<script>
import { defineComponent, ref } from "vue";
import TimeLine from "../../../../js/components/Timeline.vue";
import {
 getRequestId, getRequestStatus, getComentableType, getProcessName,
} from "../api/data";

export default defineComponent({
 components: { TimeLine },
 setup() {
 const status = ref(getRequestStatus());
 const commentableId = ref(getRequestId());
 const comentableType = ref(getComentableType());
 const processName = ref(getProcessName());
 return {
 status,
 commentableId,
 comentableType,
 processName,
 };
 },
});
</script>

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import BadgeContainer from "../../casesMain/components/BadgesSection.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};
Expand Down
Loading