Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, '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 \u003e 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,8 @@ public function index($type = null)
// This is a temporary API the engine team will provide the new
return view('cases.casesMain');
}
public function edit(ProcessRequest $request)
{
return view('cases.edit');
}
}
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
:key="index"
:columns="columns"
:column="column">
<slot :name="`theader-${column.field}`"> </slot>
<slot :name="`theader-${column.header}`"> </slot>
</THeader>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export default defineComponent({
return props.column?.headerFormatter(props.columns);
}

return props.column.headerName || props.column.field || "";
return props.column.header || props.column.field || "";
};
return {
getValue,
Expand Down
24 changes: 24 additions & 0 deletions resources/jscomposition/cases/casesDetail/api/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
export default {};

const getData = async () => {
const objectsList = [];

for (let i = 0; i <= 31; i += 1) {
const obj = {
id: `${i}`,
case_title: `Case Title ${i}`,
process_name: `Process ${i}`,
assigned: `Avatar ${i}`,
current_task: `Task ${i}`,
status: `badge ${i}`,
started: `21/21/${i}`,
due_date: `21/21/${i}`,
};

objectsList.push(obj);
}

return objectsList;
};

export { getData };
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
<template>
<div class="container-fluid">
<Tabs
:tab-default="tabDefault"
:tabs="tabs"
/>
</div>
</template>

<script>
import { defineComponent, ref } from "vue";
import Tabs from "./Tabs.vue";
import TaskTable from "./TaskTable.vue";
import RequestTable from "./RequestTable.vue";

export default defineComponent({
components: { Tabs },
setup() {
const translate = ProcessMaker.i18n;

const tabDefault = ref("tasks");

const tabs = [
{
name: translate.t("Tasks"), href: "#tasks", current: "tasks", show: true, content: TaskTable,
},
{
name: translate.t("Overview"), href: "#overview", current: "overview", show: true, content: "",
},
{
name: translate.t("Completed & Form"), href: "#completed_form", current: "completed", show: true, content: "",
},
{
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("Requests"), href: "#requests", current: "requests", show: true, content: RequestTable,
},
];

return {
tabs,
tabDefault,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="request-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("requests");
});

return {
data,
columnsConfig,
};
},
});
</script>
66 changes: 66 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
<template>
<div class="tw-block">
<div class="tw-border-b tw-border-gray-200">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
aria-label="Tabs"
>
<template v-for="(tab, index) in tabs">
<a
v-if="tab.show"
:key="index"
:href="tab.href"
class="tw-whitespace-nowrap tw-border-b-2 tw-px-1 tw-py-4 tw-text-sm tw-font-medium"
:class="[tabSelected === tab.current ? 'tw-border-blue-500 tw-text-blue-500'
: 'tw-border-transparent tw-text-gray-500 hover:tw-border-gray-600 hover:tw-text-gray-600'
]"
:aria-current="tab.current ? 'page' : undefined"
@click="selectTab(tab)"
>
{{ tab.name }}
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
</div>
</div>
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";

export default defineComponent({
props: {
tabDefault: {
type: String,
required: true,
},
tabs: {
type: Array,
required: true,
},
},
setup(props) {
const content = ref(null);
const tabSelected = ref(props.tabDefault);
const selectTab = (tab) => {
content.value = tab.content;
tabSelected.value = tab.current;
};

const defaultTab = () => props.tabs.find((tab) => tab.current === tabSelected.value);

onMounted(() => {
selectTab(defaultTab());
});

return {
content,
selectTab,
tabSelected,
};
},
});
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
<template>
<div>
<BaseTable
id="task-table"
:columns="columnsConfig"
:data="data"
/>
<Pagination />
</div>
</template>

<script>
import { defineComponent, ref, onMounted } from "vue";
import { BaseTable, Pagination } from "../../../base";
import { getData } from "../api/index";
import { getColumns } from "../config/columns";

export default defineComponent({
components: { BaseTable, Pagination },
setup() {
const data = ref(null);
const columnsConfig = ref(null);

onMounted(async () => {
data.value = await getData();
columnsConfig.value = getColumns("tasks");
});

return {
data,
columnsConfig,
};
},
});
</script>
99 changes: 99 additions & 0 deletions resources/jscomposition/cases/casesDetail/config/columns.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import BadgeContainer from "../../casesMain/components/BadgeContainer.vue";
import AvatarContainer from "../../casesMain/components/AvatarContainer.vue";

export default {};

// Column for Task
const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 200,
});

const taskNameColumn = () => ({
field: "case_title",
header: "Task Name",
resizable: true,
width: 200,
});

const processNameColumn = () => ({
field: "process_name",
header: "Process",
resizable: true,
width: 200,
});

const assignedColumn = () => ({
field: "assigned",
header: "Assigned",
resizable: true,
width: 200,
cellRenderer: () => AvatarContainer,
});

const dueDateColumn = () => ({
field: "due_date",
header: "Due Date",
resizable: true,
width: 200,
});

// Columns for Requests
const requestNumberColumn = () => ({
field: "id",
header: "Request #",
resizable: true,
width: 200,
});

const requestNameColumn = () => ({
field: "case_title",
header: "Request Name",
resizable: true,
width: 200,
});

const currentTaskColumn = () => ({
field: "current_task",
header: "Current Task",
resizable: true,
width: 200,
});

const statusColumn = () => ({
field: "status",
header: "Status",
resizable: true,
width: 200,
cellRenderer: () => BadgeContainer,
});

const startedColumn = () => ({
field: "started_date",
header: "started",
resizable: true,
width: 200,
});

export const getColumns = (type) => {
const columns = {
tasks: [
taskNumberColumn(),
taskNameColumn(),
processNameColumn(),
assignedColumn(),
dueDateColumn(),
],
requests: [
requestNumberColumn(),
requestNameColumn(),
currentTaskColumn(),
statusColumn(),
startedColumn(),
],
};

return columns[type];
};
8 changes: 8 additions & 0 deletions resources/jscomposition/cases/casesDetail/edit.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";

new Vue({
el: "#case-detail",
components: { CaseDetail },
data() {},
});
25 changes: 25 additions & 0 deletions resources/views/cases/edit.blade.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
@extends('layouts.layout')

@section('title')
{{ __('Case Detail') }}
@endsection

@section('sidebar')
@include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_request')])
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('cases.index'),
]])
@endsection

@section('content')
<div id="case-detail" class="containe-fluid mr-3 ml-3 px-3 bg-light">
<case-detail></case-detail>
</div>
@endsection

@section('js')
<script src="{{mix('js/composition/cases/casesDetail/edit.js')}}"></script>
@endsection
1 change: 1 addition & 0 deletions routes/web.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,7 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,6 +122,7 @@ mix
.js("resources/js/requests/show.js", "public/js/requests")
.js("resources/js/requests/preview.js", "public/js/requests")
.js("resources/jscomposition/cases/casesMain/main.js", "public/js/composition/cases/casesMain/main.js")
.js("resources/jscomposition/cases/casesDetail/edit.js", "public/js/composition/cases/casesDetail/edit.js")
.js("resources/js/processes/translations/import.js", "public/js/processes/translations")

.js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js")
Expand Down