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

PMCORE-3703

Browse Source
This commit is contained in:
henry jordan
2022-04-19 21:56:07 +00:00
parent e79f5ac1cc
commit 31b067fa42
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue
View File

@@ -250,15 +250,27 @@
></b-popover>
</b-col>
<b-col cols="6">
<b-form-checkbox
<b-form-checkbox
v-if="props.row.field =='process_category' || props.row.field =='process_name'"
v-model="enabledFilterRows"
@change="onTongleFilter(props.row.field)"
name="check-button"
:checked="props.row.enableFilter"
:value="props.row.field"
switch
>
</b-form-checkbox>
disabled
>
</b-form-checkbox>
<b-form-checkbox
v-else
v-model="enabledFilterRows"
@change="onTongleFilter(props.row.field)"
name="check-button"
:checked="props.row.enableFilter"
:value="props.row.field"
switch
>
</b-form-checkbox>
</b-col>
</b-row>
</div>
@@ -294,7 +306,6 @@
</div>
</template>
<script>
import utils from "../../../utils/utils";
import Multiselect from "vue-multiselect";
import Api from "./Api/CaseList";
import IconPicker from "../../../components/iconPicker/IconPicker.vue";
@@ -420,7 +431,8 @@ export default {
this.data =this.params.columns.filter(elem => elem.set === false);
this.dataCaseList =this.params.columns.filter(elem => elem.set === true);
this.dataCaseList.forEach(function (value) {
if (value.enableFilter) {
//Force to false in process_category & process_name
if (value.enableFilter && (value.field != "process_category" && value.field != "process_name" )) {
that.enabledFilterRows.push(value.field);
}
});

1
resources/assets/js/admin/settings/customCaseList/main.js
View File

@@ -4,7 +4,6 @@ import VueSidebarMenu from "vue-sidebar-menu";
import VueI18n from 'vue-i18n';
import { BootstrapVue } from 'bootstrap-vue';
import { ServerTable, Event, ClientTable} from 'vue-tables-2';
import Sortable from 'sortablejs';
import "@fortawesome/fontawesome-free/css/all.css";
import 'bootstrap/dist/css/bootstrap-grid.css';
import 'bootstrap/dist/css/bootstrap.min.css'

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

@@ -398,6 +398,7 @@ export default {
},
itemMap: {
case_number: "caseNumber",
task_title: "taskTitle",
thread_title: "caseTitle",
delegation_date: "delegationDate",
send_by: "bySendBy",
@@ -809,7 +810,9 @@ export default {
}
}
that.headings[item.field] = item.name;
columns.push(item.field);
if(item.enableFilter){
columns.push(item.field);
}
});
that.filterItems = newItems;
dt = that.formatDataResponse(response.data.data);

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

@@ -401,7 +401,7 @@ class CaseList extends Model
'set' => true
], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'task',
'field' => 'task_title',
'name' => G::LoadTranslation('ID_TASK'),
'type' => 'string',
'source' => 'APPLICATION',