fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.7.2 (pull request #8323)

Browse Source 
release/3.7.2

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-12-14 16:23:45 +00:00
committed by Julio Cesar Laura Avendaño
parent ef481683bd 3b35ee6410
commit d4beed9ae9
20 changed files with 250 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@@ -35,9 +35,9 @@
"laravel/framework": "5.7.*", "laravel/framework": "5.7.*",
"luracast/restler": "3.0", "luracast/restler": "3.0",
"bshaffer/oauth2-server-php": "v1.0", "bshaffer/oauth2-server-php": "v1.0",
"colosa/pmui": "release/3.7.0-dev", "colosa/pmui": "release/3.7.2-dev",
"colosa/michelangelofe": "release/3.7.0-dev", "colosa/michelangelofe": "release/3.7.2-dev",
"colosa/pmdynaform": "release/3.7.0-dev", "colosa/pmdynaform": "release/3.7.2-dev",
"colosa/taskscheduler": "release/1.0.2-dev", "colosa/taskscheduler": "release/1.0.2-dev",
"google/apiclient": "1.1.6", "google/apiclient": "1.1.6",
"dapphp/securimage": "^3.6", "dapphp/securimage": "^3.6",

2
database/factories/ProcessFactory.php
View File

@@ -26,6 +26,7 @@ $factory->define(\ProcessMaker\Model\Process::class, function (Faker $faker) {
'PRO_DYNAFORMS' => serialize([]), 'PRO_DYNAFORMS' => serialize([]),
'PRO_ITEE' => 1, 'PRO_ITEE' => 1,
'PRO_ACTION_DONE' => serialize([]), 'PRO_ACTION_DONE' => serialize([]),
'PRO_SUBPROCESS' => 0,
'PRO_CATEGORY' => function () { 'PRO_CATEGORY' => function () {
return factory(\ProcessMaker\Model\ProcessCategory::class)->create()->CATEGORY_UID; return factory(\ProcessMaker\Model\ProcessCategory::class)->create()->CATEGORY_UID;
}, },
@@ -56,6 +57,7 @@ $factory->state(\ProcessMaker\Model\Process::class, 'foreign_keys', function (Fa
'PRO_DYNAFORMS' => serialize([]), 'PRO_DYNAFORMS' => serialize([]),
'PRO_ITEE' => 1, 'PRO_ITEE' => 1,
'PRO_ACTION_DONE' => serialize([]), 'PRO_ACTION_DONE' => serialize([]),
'PRO_SUBPROCESS' => 0,
'PRO_CATEGORY' => function () { 'PRO_CATEGORY' => function () {
return factory(\ProcessMaker\Model\ProcessCategory::class)->create()->CATEGORY_UID; return factory(\ProcessMaker\Model\ProcessCategory::class)->create()->CATEGORY_UID;
}, },

16
resources/assets/js/components/search/CasesFilter.vue
View File

@@ -16,14 +16,6 @@
stacked stacked
></b-form-radio-group> ></b-form-radio-group>
<b-form-group> </b-form-group> <b-form-group> </b-form-group>
<b-form-checkbox
id="checkbox-1"
v-model="byProcessName"
name="checkbox-1"
value="processName"
>
{{ $t("ID_BY_PROCESS_NAME") }}
</b-form-checkbox>
<b-form-checkbox <b-form-checkbox
id="checkbox-2" id="checkbox-2"
v-model="byProcessCategory" v-model="byProcessCategory"
@@ -32,6 +24,14 @@
> >
{{ $t("ID_BY_PROCESS_CATEGORY") }} {{ $t("ID_BY_PROCESS_CATEGORY") }}
</b-form-checkbox> </b-form-checkbox>
<b-form-checkbox
id="checkbox-1"
v-model="byProcessName"
name="checkbox-1"
value="processName"
>
{{ $t("ID_BY_PROCESS_NAME") }}
</b-form-checkbox>
</b-form-group> </b-form-group>
</template> </template>
</SearchPopover> </SearchPopover>

17
resources/assets/js/components/search/MyCasesFilter.vue
View File

@@ -17,14 +17,6 @@
stacked stacked
></b-form-radio-group> ></b-form-radio-group>
</b-form-group> </b-form-group>
<b-form-checkbox
id="checkbox-1"
v-model="byProcessName"
name="checkbox-1"
value="processName"
>
{{$t('ID_BY_PROCESS_NAME') }}
</b-form-checkbox>
<b-form-checkbox <b-form-checkbox
id="checkbox-2" id="checkbox-2"
v-model="byProcessCategory" v-model="byProcessCategory"
@@ -33,7 +25,14 @@
> >
{{$t('ID_BY_PROCESS_CATEGORY') }} {{$t('ID_BY_PROCESS_CATEGORY') }}
</b-form-checkbox> </b-form-checkbox>
<b-form-checkbox
id="checkbox-1"
v-model="byProcessName"
name="checkbox-1"
value="processName"
>
{{$t('ID_BY_PROCESS_NAME') }}
</b-form-checkbox>
</template> </template>
</SearchPopover> </SearchPopover>

10
resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue
View File

@@ -49,12 +49,12 @@
<div slot="case_status" slot-scope="props"> <div slot="case_status" slot-scope="props">
{{ props.row.APP_STATUS }} {{ props.row.APP_STATUS }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
@@ -145,8 +145,8 @@ export default {
}, },
columns: [ columns: [
"case_number", "case_number",
"process_name",
"process_category", "process_category",
"process_name",
"status", "status",
"thread_title", "thread_title",
"task", "task",
@@ -161,8 +161,8 @@ export default {
filterable: false, filterable: false,
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
status: this.$i18n.t("ID_STATUS"), status: this.$i18n.t("ID_STATUS"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),

62
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -55,12 +55,12 @@
<div slot="case_title" slot-scope="props"> <div slot="case_title" slot-scope="props">
{{ props.row.THREAD_TITLE }} {{ props.row.THREAD_TITLE }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
@@ -130,12 +130,12 @@
<span v-if="column === 'thread_title'" class="v-card-text-highlight"> <span v-if="column === 'thread_title'" class="v-card-text-highlight">
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
<span v-if="column === 'process_name'" class="v-card-text-highlight">
{{ props["item"]["PROCESS_NAME"] }}
</span>
<span v-if="column === 'process_category'" class="v-card-text-highlight"> <span v-if="column === 'process_category'" class="v-card-text-highlight">
{{ props["item"]["PROCESS_CATEGORY"] }} {{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
<span v-if="column === 'process_name'" class="v-card-text-highlight">
{{ props["item"]["PROCESS_NAME"] }}
</span>
<span v-if="column === 'due_date'" class="v-card-text-highlight"> <span v-if="column === 'due_date'" class="v-card-text-highlight">
{{ props["item"]["DUE_DATE"] }} {{ props["item"]["DUE_DATE"] }}
</span> </span>
@@ -187,12 +187,12 @@
<span v-if="column === 'thread_title'" class="v-card-text-highlight"> <span v-if="column === 'thread_title'" class="v-card-text-highlight">
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
<span v-if="column === 'process_name'" class="v-card-text-highlight">
{{ props["item"]["PROCESS_NAME"] }}
</span>
<span v-if="column === 'process_category'" class="v-card-text-highlight"> <span v-if="column === 'process_category'" class="v-card-text-highlight">
{{ props["item"]["PROCESS_CATEGORY"] }} {{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
<span v-if="column === 'process_name'" class="v-card-text-highlight">
{{ props["item"]["PROCESS_NAME"] }}
</span>
<span v-if="column === 'due_date'" class="v-card-text-highlight"> <span v-if="column === 'due_date'" class="v-card-text-highlight">
{{ props["item"]["DUE_DATE"] }} {{ props["item"]["DUE_DATE"] }}
</span> </span>
@@ -565,28 +565,6 @@ export default {
return `${this.tagPrefix}: ${data[0].label || ""}`; return `${this.tagPrefix}: ${data[0].label || ""}`;
}, },
}, },
processName: {
group: "checkbox",
type: "ProcessName",
id: "processName",
title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PROCESS_NAME')}`,
optionLabel: this.$i18n.t('ID_BY_PROCESS_NAME'),
detail: "",
tagText: "",
tagPrefix: this.$i18n.t('ID_SEARCH_BY_PROCESS_NAME'),
autoShow: false,
items:[
{
id: "process",
value: "",
options: [],
placeholder: this.$i18n.t('ID_PROCESS_NAME')
}
],
makeTagText: function (params, data) {
return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`;
}
},
processCategory: { processCategory: {
group: "checkbox", group: "checkbox",
type: "ProcessCategory", type: "ProcessCategory",
@@ -609,6 +587,28 @@ export default {
return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`;
} }
}, },
processName: {
group: "checkbox",
type: "ProcessName",
id: "processName",
title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PROCESS_NAME')}`,
optionLabel: this.$i18n.t('ID_BY_PROCESS_NAME'),
detail: "",
tagText: "",
tagPrefix: this.$i18n.t('ID_SEARCH_BY_PROCESS_NAME'),
autoShow: false,
items:[
{
id: "process",
value: "",
options: [],
placeholder: this.$i18n.t('ID_PROCESS_NAME')
}
],
makeTagText: function (params, data) {
return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`;
}
},
showUserTooltip: true showUserTooltip: true
} }
}; };

40
resources/assets/js/home/Draft/Draft.vue
View File

@@ -51,12 +51,12 @@
<div slot="thread_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.THREAD_TITLE }} {{ props.row.THREAD_TITLE }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
@@ -99,14 +99,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -115,6 +107,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -181,14 +181,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -197,6 +189,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -314,8 +314,8 @@ export default {
detail: this.$i18n.t("ID_DETAIL_CASE"), detail: this.$i18n.t("ID_DETAIL_CASE"),
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
priority: this.$i18n.t("ID_PRIORITY"), priority: this.$i18n.t("ID_PRIORITY"),
actions: "" actions: ""

2
resources/assets/js/home/Draft/defaultMixins.js
View File

@@ -53,8 +53,8 @@ export default {
detail: "", detail: "",
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
current_user: this.$i18n.t("ID_CURRENT_USER"), current_user: this.$i18n.t("ID_CURRENT_USER"),
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),

40
resources/assets/js/home/Inbox/Inbox.vue
View File

@@ -46,12 +46,12 @@
<div slot="thread_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.THREAD_TITLE }} {{ props.row.THREAD_TITLE }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
@@ -106,14 +106,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -122,6 +114,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -195,14 +195,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -211,6 +203,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -345,8 +345,8 @@ export default {
detail: this.$i18n.t("ID_DETAIL_CASE"), detail: this.$i18n.t("ID_DETAIL_CASE"),
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),

4
resources/assets/js/home/Inbox/defaultMixins.js
View File

@@ -53,8 +53,8 @@ export default {
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),
current_user: this.$i18n.t("ID_CURRENT_USER"), current_user: this.$i18n.t("ID_CURRENT_USER"),
@@ -65,8 +65,8 @@ export default {
columns: [ columns: [
"case_number", "case_number",
"thread_title", "thread_title",
"process_name",
"process_category", "process_category",
"process_name",
"due_date", "due_date",
"delegation_date", "delegation_date",
"priority", "priority",

8
resources/assets/js/home/MyCases/MyCases.vue
View File

@@ -47,12 +47,12 @@
<div slot="thread_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
<ThreadTitleCell :data="props.row.THREAD_TITLE" /> <ThreadTitleCell :data="props.row.THREAD_TITLE" />
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="pending_taks" slot-scope="props"> <div slot="pending_taks" slot-scope="props">
<GroupedCell :data="props.row.PENDING_TASKS" /> <GroupedCell :data="props.row.PENDING_TASKS" />
</div> </div>
@@ -163,8 +163,8 @@ export default {
filterable: false, filterable: false,
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
pending_taks: this.$i18n.t("ID_PENDING_TASKS"), pending_taks: this.$i18n.t("ID_PENDING_TASKS"),
status: this.$i18n.t("ID_CASESLIST_APP_STATUS"), status: this.$i18n.t("ID_CASESLIST_APP_STATUS"),

40
resources/assets/js/home/Paused/Paused.vue
View File

@@ -45,12 +45,12 @@
<div slot="thread_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.THREAD_TITLE }} {{ props.row.THREAD_TITLE }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
@@ -105,14 +105,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -121,6 +113,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -194,14 +194,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -210,6 +202,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -345,8 +345,8 @@ export default {
detail: this.$i18n.t("ID_DETAIL_CASE"), detail: this.$i18n.t("ID_DETAIL_CASE"),
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),

4
resources/assets/js/home/Paused/defaultMixins.js
View File

@@ -52,8 +52,8 @@ export default {
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),
current_user: this.$i18n.t("ID_CURRENT_USER"), current_user: this.$i18n.t("ID_CURRENT_USER"),
@@ -64,8 +64,8 @@ export default {
columns: [ columns: [
"case_number", "case_number",
"thread_title", "thread_title",
"process_name",
"process_category", "process_category",
"process_name",
"due_date", "due_date",
"delegation_date", "delegation_date",
"priority", "priority",

40
resources/assets/js/home/Unassigned/Unassigned.vue
View File

@@ -43,12 +43,12 @@
<div slot="thread_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.THREAD_TITLE }} {{ props.row.THREAD_TITLE }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="process_category" slot-scope="props"> <div slot="process_category" slot-scope="props">
{{ props.row.PROCESS_CATEGORY }} {{ props.row.PROCESS_CATEGORY }}
</div> </div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
@@ -100,14 +100,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -116,6 +108,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -189,14 +189,6 @@
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="process_category" slot-scope="props" class="v-card-text"> <div slot="process_category" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -205,6 +197,14 @@
>{{ props["item"]["PROCESS_CATEGORY"] }} >{{ props["item"]["PROCESS_CATEGORY"] }}
</span> </span>
</div> </div>
<div slot="process_name" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light"
>{{ props["item"]["PROCESS_NAME"] }}
</span>
</div>
<div slot="due_date" slot-scope="props" class="v-card-text"> <div slot="due_date" slot-scope="props" class="v-card-text">
<span class="v-card-text-dark" <span class="v-card-text-dark"
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
@@ -337,8 +337,8 @@ export default {
detail: this.$i18n.t("ID_DETAIL_CASE"), detail: this.$i18n.t("ID_DETAIL_CASE"),
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),

4
resources/assets/js/home/Unassigned/defaultMixins.js
View File

@@ -52,8 +52,8 @@ export default {
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),
current_user: this.$i18n.t("ID_CURRENT_USER"), current_user: this.$i18n.t("ID_CURRENT_USER"),
@@ -64,8 +64,8 @@ export default {
columns: [ columns: [
"case_number", "case_number",
"thread_title", "thread_title",
"process_name",
"process_category", "process_category",
"process_name",
"due_date", "due_date",
"delegation_date", "delegation_date",
"priority", "priority",

80
tests/unit/workflow/engine/src/ProcessMaker/Model/ProcessTest.php
View File

@@ -258,8 +258,10 @@ class ProcessTest extends TestCase
* It tests the process list * It tests the process list
* *
* @covers \ProcessMaker\Model\Process::getProcessesFilter() * @covers \ProcessMaker\Model\Process::getProcessesFilter()
* @covers \ProcessMaker\Model\Process::getListColumns()
* @covers \ProcessMaker\Model\Process::scopeJoinUsers()
* @covers \ProcessMaker\Model\Process::scopeJoinCategory()
* @covers \ProcessMaker\Model\Process::scopeNoStatus() * @covers \ProcessMaker\Model\Process::scopeNoStatus()
* @covers \ProcessMaker\Model\Process::scopeSubProcess()
* @test * @test
*/ */
public function it_should_test_process_without_filter() public function it_should_test_process_without_filter()
@@ -278,7 +280,11 @@ class ProcessTest extends TestCase
* It tests the process list with specific category * It tests the process list with specific category
* *
* @covers \ProcessMaker\Model\Process::getProcessesFilter() * @covers \ProcessMaker\Model\Process::getProcessesFilter()
* @covers \ProcessMaker\Model\Process::getListColumns()
* @covers \ProcessMaker\Model\Process::scopeJoinUsers()
* @covers \ProcessMaker\Model\Process::scopeJoinCategory()
* @covers \ProcessMaker\Model\Process::scopeCategory() * @covers \ProcessMaker\Model\Process::scopeCategory()
* @covers \ProcessMaker\Model\Process::scopePerUser()
* @test * @test
*/ */
public function it_should_test_process_with_category_filter() public function it_should_test_process_with_category_filter()
@@ -288,16 +294,23 @@ class ProcessTest extends TestCase
return factory(ProcessCategory::class)->create()->CATEGORY_UID; return factory(ProcessCategory::class)->create()->CATEGORY_UID;
} }
]); ]);
$result = Process::getProcessesFilter( $result = Process::getProcessesFilter($process->PRO_CATEGORY);
$process->PRO_CATEGORY // Assert with the specific category
);
$this->assertEquals($process->PRO_CATEGORY, $result[0]['PRO_CATEGORY']); $this->assertEquals($process->PRO_CATEGORY, $result[0]['PRO_CATEGORY']);
$process = factory(Process::class)->create();
$result = Process::getProcessesFilter('NONE');
// Assert when the category is empty
$this->assertEmpty($result);
} }
/** /**
* It tests the process list with specific process * It tests the process list with specific process
* *
* @covers \ProcessMaker\Model\Process::getProcessesFilter() * @covers \ProcessMaker\Model\Process::getProcessesFilter()
* @covers \ProcessMaker\Model\Process::getListColumns()
* @covers \ProcessMaker\Model\Process::scopeJoinUsers()
* @covers \ProcessMaker\Model\Process::scopeJoinCategory()
* @covers \ProcessMaker\Model\Process::scopeProcess() * @covers \ProcessMaker\Model\Process::scopeProcess()
* @test * @test
*/ */
@@ -315,6 +328,9 @@ class ProcessTest extends TestCase
* It tests the process list with specific process title * It tests the process list with specific process title
* *
* @covers \ProcessMaker\Model\Process::getProcessesFilter() * @covers \ProcessMaker\Model\Process::getProcessesFilter()
* @covers \ProcessMaker\Model\Process::getListColumns()
* @covers \ProcessMaker\Model\Process::scopeJoinUsers()
* @covers \ProcessMaker\Model\Process::scopeJoinCategory()
* @covers \ProcessMaker\Model\Process::scopeTitle() * @covers \ProcessMaker\Model\Process::scopeTitle()
* @test * @test
*/ */
@@ -329,10 +345,41 @@ class ProcessTest extends TestCase
$this->assertEquals($process->PRO_TITLE, $result[0]['PRO_TITLE']); $this->assertEquals($process->PRO_TITLE, $result[0]['PRO_TITLE']);
} }
/**
* It tests the process list with suprocess filter
*
* @covers \ProcessMaker\Model\Process::getProcessesFilter()
* @covers \ProcessMaker\Model\Process::getListColumns()
* @covers \ProcessMaker\Model\Process::scopeJoinUsers()
* @covers \ProcessMaker\Model\Process::scopeJoinCategory()
* @covers \ProcessMaker\Model\Process::scopeSubProcess()
* @test
*/
public function it_should_test_process_subprocess_filter()
{
$process = factory(Process::class)->create([
'PRO_SUBPROCESS' => 1
]);
$result = Process::getProcessesFilter(
null,
null,
null,
$process->PRO_CREATE_USER,
0,
25,
'ASC',
'PRO_CREATE_DATE',
true,
true
);
$this->assertEquals($process->PRO_CREATE_USER, $result[0]['USR_UID']);
}
/** /**
* It tests the count process * It tests the count process
* *
* @covers \ProcessMaker\Model\Process::getCounter() * @covers \ProcessMaker\Model\Process::getCounter()
* @covers \ProcessMaker\Model\Process::scopePerUser()
* @test * @test
*/ */
public function it_should_test_count_process() public function it_should_test_count_process()
@@ -346,6 +393,8 @@ class ProcessTest extends TestCase
* It test get processes for the new home view * It test get processes for the new home view
* *
* @covers \ProcessMaker\Model\Process::getProcessesForHome() * @covers \ProcessMaker\Model\Process::getProcessesForHome()
* @covers \ProcessMaker\Model\Process::scopeCategoryId()
* @covers \ProcessMaker\Model\Process::scopeStatus()
* @test * @test
*/ */
public function it_should_test_get_processes_for_home() public function it_should_test_get_processes_for_home()
@@ -356,11 +405,13 @@ class ProcessTest extends TestCase
// Create five processes (4 active, 1 inactive) // Create five processes (4 active, 1 inactive)
factory(Process::class)->create([ factory(Process::class)->create([
'PRO_TITLE' => 'My Process 1', 'PRO_TITLE' => 'My Process 1',
'PRO_CATEGORY' => $processCategory->CATEGORY_UID 'PRO_CATEGORY' => $processCategory->CATEGORY_UID,
'CATEGORY_ID' => $processCategory->CATEGORY_ID
]); ]);
factory(Process::class)->create([ factory(Process::class)->create([
'PRO_TITLE' => 'My Process 2', 'PRO_TITLE' => 'My Process 2',
'PRO_CATEGORY' => $processCategory->CATEGORY_UID 'PRO_CATEGORY' => $processCategory->CATEGORY_UID,
'CATEGORY_ID' => $processCategory->CATEGORY_ID
]); ]);
factory(Process::class)->create([ factory(Process::class)->create([
'PRO_TITLE' => 'My Process 3', 'PRO_TITLE' => 'My Process 3',
@@ -376,8 +427,21 @@ class ProcessTest extends TestCase
// Assertions // Assertions
$this->assertCount(4, Process::getProcessesForHome()); $this->assertCount(4, Process::getProcessesForHome());
$this->assertCount(3, Process::getProcessesForHome('My Process')); $this->assertCount(3, Process::getProcessesForHome('My Process'));
$this->assertCount(2, Process::getProcessesForHome(null, $processCategory->CATEGORY_UID)); $this->assertCount(2, Process::getProcessesForHome(null, $processCategory->CATEGORY_ID));
$this->assertCount(4, Process::getProcessesForHome(null, null, null, 2)); $this->assertCount(4, Process::getProcessesForHome(null, null, null, 2));
$this->assertCount(1, Process::getProcessesForHome(null, null, 2, 1)); $this->assertCount(1, Process::getProcessesForHome(null, null, 2, 1, true));
}
/**
* It tests the isActive process
*
* @covers \ProcessMaker\Model\Process::isActive()
* @test
*/
public function it_should_test_is_active()
{
$process = factory(Process::class)->create();
$total = Process::isActive($process->PRO_ID);
$this->assertEquals(1, $total);
} }
} }

3
workflow/engine/classes/WorkspaceTools.php
View File

@@ -374,7 +374,8 @@ class WorkspaceTools
$start = microtime(true); $start = microtime(true);
Bootstrap::setConstantsRelatedWs($workspace); Bootstrap::setConstantsRelatedWs($workspace);
Propel::init(PATH_CONFIG . 'databases.php'); Propel::init(PATH_CONFIG . 'databases.php');
WebEntry::convertFromV1ToV2(); $statement = Propel::getConnection('workflow')->createStatement();
$statement->executeQuery(WebEntry::UPDATE_QUERY_V1_TO_V2);
CLI::logging("* End converting Web Entries v1.0 to v2.0 for BPMN processes...(" . (microtime(true) - $start) . " seconds)\n"); CLI::logging("* End converting Web Entries v1.0 to v2.0 for BPMN processes...(" . (microtime(true) - $start) . " seconds)\n");
CLI::logging("* Start migrating case title...\n"); CLI::logging("* Start migrating case title...\n");

8
workflow/engine/src/ProcessMaker/Model/CaseList.php
View File

@@ -383,8 +383,8 @@ class CaseList extends Model
'set' => true 'set' => true
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'process_name', 'field' => 'process_category',
'name' => G::LoadTranslation('ID_PROCESS_NAME'), 'name' => G::LoadTranslation('ID_PROCESS_CATEGORY'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
'typeSearch' => 'search text', 'typeSearch' => 'search text',
@@ -392,8 +392,8 @@ class CaseList extends Model
'set' => true 'set' => true
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'process_category', 'field' => 'process_name',
'name' => G::LoadTranslation('ID_PROCESS_CATEGORY'), 'name' => G::LoadTranslation('ID_PROCESS_NAME'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
'typeSearch' => 'search text', 'typeSearch' => 'search text',

27
workflow/engine/src/ProcessMaker/Model/Process.php
View File

@@ -78,6 +78,7 @@ class Process extends Model
* *
* @param \Illuminate\Database\Eloquent\Builder $query * @param \Illuminate\Database\Eloquent\Builder $query
* @param string $proUid * @param string $proUid
*
* @return \Illuminate\Database\Eloquent\Builder * @return \Illuminate\Database\Eloquent\Builder
*/ */
public function scopeProcess($query, $proUid) public function scopeProcess($query, $proUid)
@@ -90,6 +91,7 @@ class Process extends Model
* *
* @param \Illuminate\Database\Eloquent\Builder $query * @param \Illuminate\Database\Eloquent\Builder $query
* @param string $title * @param string $title
*
* @return \Illuminate\Database\Eloquent\Builder * @return \Illuminate\Database\Eloquent\Builder
*/ */
public function scopeTitle($query, $title) public function scopeTitle($query, $title)
@@ -102,6 +104,7 @@ class Process extends Model
* *
* @param \Illuminate\Database\Eloquent\Builder $query * @param \Illuminate\Database\Eloquent\Builder $query
* @param string $status * @param string $status
*
* @return \Illuminate\Database\Eloquent\Builder * @return \Illuminate\Database\Eloquent\Builder
*/ */
public function scopeNoStatus($query, $status = 'DISABLED') public function scopeNoStatus($query, $status = 'DISABLED')
@@ -120,6 +123,19 @@ class Process extends Model
return $query->where('PRO_SUBPROCESS', '=', 1); return $query->where('PRO_SUBPROCESS', '=', 1);
} }
/**
* Scope a query to include a specific process categoryId
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param int $category
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeCategoryId($query, $category)
{
return $query->where('PROCESS.CATEGORY_ID', $category);
}
/** /**
* Scope a query to include a specific process category * Scope a query to include a specific process category
* *
@@ -407,14 +423,14 @@ class Process extends Model
* Get all processes, paged optionally, can be sent a string to filter results by "PRO_TITLE" * Get all processes, paged optionally, can be sent a string to filter results by "PRO_TITLE"
* *
* @param string $text * @param string $text
* @param string $category * @param int $catId
* @param int $offset * @param int $offset
* @param int $limit * @param int $limit
* @param bool $paged * @param bool $paged
* *
* @return array * @return array
*/ */
public static function getProcessesForHome($text = null, $category = null, $offset = null, $limit = null, $paged = true) public static function getProcessesForHome($text = null, $catId = 0, $offset = null, $limit = null, $paged = true)
{ {
// Get base query // Get base query
$query = Process::query()->select(['PRO_ID', 'PRO_TITLE']); $query = Process::query()->select(['PRO_ID', 'PRO_TITLE']);
@@ -424,9 +440,9 @@ class Process extends Model
$query->title($text); $query->title($text);
} }
// Set "PRO_CATEGORY" condition if is sent // Set "CATEGORY_ID" condition if is sent
if (!is_null($category)) { if ($catId) {
$query->category($category); $query->categoryId($catId);
} }
// Set "PRO_STATUS" condition // Set "PRO_STATUS" condition
@@ -452,6 +468,7 @@ class Process extends Model
* Return true if process is active, false otherwise. * Return true if process is active, false otherwise.
* @param int|string $proId * @param int|string $proId
* @param string $key * @param string $key
*
* @return bool * @return bool
*/ */
public static function isActive($proId, string $key = 'PRO_ID'): bool public static function isActive($proId, string $key = 'PRO_ID'): bool

4
workflow/engine/src/ProcessMaker/Services/Api/Home.php
View File

@@ -889,7 +889,7 @@ class Home extends Api
* @url GET /processes * @url GET /processes
* *
* @param string $text * @param string $text
* @param string $category * @param int $category
* @param int $offset * @param int $offset
* @param int $limit * @param int $limit
* @param bool $paged * @param bool $paged
@@ -901,7 +901,7 @@ class Home extends Api
* @access protected * @access protected
* @class AccessControl {@permission PM_CASES} * @class AccessControl {@permission PM_CASES}
*/ */
public function getProcesses($text = null, $category = null, int $offset = 0, int $limit = 15, $paged = true) public function getProcesses($text = null, $category = 0, int $offset = 0, int $limit = 15, $paged = true)
{ {
try { try {
return Process::getProcessesForHome($text, $category, $offset, $limit, $paged); return Process::getProcessesForHome($text, $category, $offset, $limit, $paged);