Merged in release/3.8.1 (pull request #8656)

release/3.8.1
This commit is contained in:
Paula Quispe
2022-12-05 19:22:22 +00:00
114 changed files with 1615 additions and 790 deletions

View File

@@ -4,7 +4,7 @@ jobs:
working_directory: ~/processmaker
docker:
- image: devopsstacks/pm:n285-phpunit
- image: circleci/mysql:8.0.13-ram
- image: cimg/mysql:8.0
command: |
mysqld --default-authentication-plugin='mysql_native_password' --optimizer-switch='derived_merge=off' --sql-mode='NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' --collation-server='utf8mb4_unicode_ci' --character-set-server='utf8mb4' --max_connections=500
environment:
@@ -28,10 +28,12 @@ jobs:
name: Run Test Units
command: |
mkdir -p coverage
vendor/phpunit/phpunit/phpunit --stop-on-error --testdox-html coverage/result.html --coverage-html coverage --verbose tests/unit/
vendor/bin/phpunit --stop-on-error --testdox-html coverage/result.html --coverage-html coverage --verbose tests/unit/
environment:
XDEBUG_MODE: coverage
- store_artifacts:
path: coverage
destination: coverage
- store_test_results:
path: coverage

View File

@@ -96,7 +96,6 @@
"thirdparty/pear",
"thirdparty/phing",
"thirdparty/pake",
"thirdparty/wizard",
"rbac/engine/classes/"
],
"files": [

View File

@@ -9,7 +9,7 @@ return [
'url' => env('APP_URL', 'http://localhost'),
'env' => env('APP_ENV', 'production'),
'debug' => env('APP_DEBUG', false),
'cache_lifetime' => env('APP_CACHE_LIFETIME', 60),
'cache_lifetime' => env('APP_CACHE_LIFETIME', 3600), //laravel 8.x the time parameter is in seconds.
'key' => env('APP_KEY', 'base64:rU28h/tElUn/eiLY0qC24jJq1rakvAFRoRl1DWxj/kM='),
'cipher' => 'AES-256-CBC',
'timezone' => 'UTC',

View File

@@ -368,6 +368,7 @@ class DataBaseMaintenance
. ' --port=' . $dbPort
. ' --opt'
. ' --skip-comments'
. ' --no-tablespaces'
. ' ' . $this->getDbName()
. ' > ' . $outfile;
} else {
@@ -376,6 +377,7 @@ class DataBaseMaintenance
. ' --user=' . $this->getUser()
. ' --opt'
. ' --skip-comments'
. ' --no-tablespaces'
. ' --password=' . $password
. ' ' . $this->getDbName()
. ' > ' . $outfile;

View File

@@ -25,6 +25,21 @@
</testsuite>
</testsuites>
<coverage processUncoveredFiles="false">
<include>
<directory suffix=".php">./app</directory>
<directory suffix=".php">./gulliver</directory>
<directory suffix=".php">./rbac</directory>
<directory suffix=".php">./workflow</directory>
</include>
<exclude>
<directory>./workflow/engine/classes/model/map</directory>
<directory>./workflow/engine/classes/model/om</directory>
<directory>./workflow/public_html</directory>
<directory>./workflow/engine/templates</directory>
</exclude>
</coverage>
<php>
<!--Main environment-->
<env name="MAIN_SYS_SYS" value="workflow" />

View File

@@ -2,8 +2,8 @@
<div class="container py-2">
<div class="row"></div>
<div class="comments col-md-12" id="comments">
<p>
<b>{{ data.title }}</b>
<p class="commentTitle">
{{ data.title }}
</p>
<div v-for="item in data.items" :key="item.date">
<case-comment
@@ -45,6 +45,7 @@
ref="comment"
cols="80"
rows="5"
aria-label="comments"
></textarea>
</div>
</div>
@@ -52,7 +53,7 @@
</div>
<div class="comment mb-2 row float-right">
<div class="form-check v-check-comment">
<input type="checkbox" class="form-check-input" ref="send" />
<input id="sendEmail" type="checkbox" class="form-check-input" ref="send" />
<label class="form-check-label" for="sendEmail">
{{ $t("ID_SEND_EMAIL_CASE_PARTICIPANTS") }}</label
>
@@ -216,4 +217,7 @@ export default {
font-size: 32px;
color: antiquewhite;
}
.commentTitle {
font-weight: bolder;
}
</style>

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="IFrameCaseHistory"
title="IFrameCaseHistory"
frameborder="0"
:src="path"
:height="height"

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="IFrameChangeLog"
title="IFrameChangeLog"
frameborder="0"
:src="path"
:height="height"

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="IFrameSummaryForm"
title="IFrameSummaryForm"
frameborder="0"
:src="path"
:height="height"

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="IFrameProcessMap"
title="IFrameProcessMap"
frameborder="0"
:src="path"
:height="height"

View File

@@ -1,5 +1,5 @@
<template>
<div id="my-container">
<div :id="`menu-${item.id}`">
<div
v-if="item.header && !isItemHidden"
class="vsm--header"

View File

@@ -23,7 +23,7 @@
</div>
</template>
<template v-slot:body>
<b-form-group>
<b-form-group label-for="advancedFilter">
<b-form-checkbox-group
v-model="selected"
:options="filterItems"
@@ -82,7 +82,9 @@
<b-form-group
:state="caseNumberState"
:invalid-feedback="$t('ID_INVALID_APPLICATION_NUMBER')"
label-for="caseNumber"
>
<label for="case-number-input"></label>
<b-form-input
id="case-number-input"
v-model="caseNumber"
@@ -90,6 +92,7 @@
:placeholder="$t('ID_CASE_NUMBER_CAPITALIZED')"
required
type="number"
aria-label="case_number"
></b-form-input>
</b-form-group>
</form>
@@ -147,6 +150,7 @@
variant="outline-secondary"
class="pull-right"
@click="onSearch"
aria-label="search"
>
<b-icon icon="search"></b-icon>
</b-button>

View File

@@ -6,7 +6,7 @@
:title="addSearchTitle"
>
<template v-slot:body>
<b-form-group>
<b-form-group label-for="casesFilter">
<b-form-radio-group
v-model="selected"
:options="criteriaItems"
@@ -15,7 +15,7 @@
name="flavour-2a"
stacked
></b-form-radio-group>
<b-form-group> </b-form-group>
<p></p>
<b-form-checkbox
id="checkbox-2"
v-model="byProcessCategory"

View File

@@ -6,7 +6,7 @@
:title="addSearchTitle"
>
<template v-slot:body>
<b-form-group>
<b-form-group label-for="customFilter">
<b-form-radio-group
v-model="selectedRadio"
:options="getFilterColletion('radio')"
@@ -15,7 +15,7 @@
name="flavour-2a"
stacked
></b-form-radio-group>
<b-form-group> </b-form-group>
<p></p>
<b-form-checkbox-group
id="checkbox-custom-filter"
v-model="selectedCheckbox"

View File

@@ -6,8 +6,7 @@
:title="addSearchTitle"
>
<template v-slot:body>
<b-form-group>
<b-form-group label-for="myCasesFilter">
<b-form-radio-group
v-model="selected"
:options="filterItems"

View File

@@ -11,7 +11,7 @@
>
<span
v-html="tab.header"
:aria-controls="tab.hash"
:aria-label="tab.hash"
:aria-selected="tab.isActive"
@click="selectTab(tab.hash, $event)"
class="tabs-component-tab-a"

View File

@@ -16,7 +16,7 @@
<span>{{ item.label }}</span>
</span>
</li>
<div
<li
v-for="item in settings"
:key="item.id"
class="vp-bread-crumbs-settings vp-float-right vp-inline-block"
@@ -29,7 +29,7 @@
>
<i :class="formatClass(item)"></i>
</span>
</div>
</li>
</ol>
</nav>
</template>

View File

@@ -23,6 +23,7 @@
:key="item.name"
variant="outline-info"
@click="executeFunction(item.fn)"
:aria-label="item.name"
>
<i class="custom-icon" :class="item.icon" v-bind:style="{color: item.color}"></i>
</b-button>

View File

@@ -8,36 +8,32 @@
@show="onshow"
>
<template #title>{{ $t("ID_COLUMNS").toUpperCase() }}</template>
<div>
<div class="input-group input-group-sm mb-3">
<span class="input-group-text" id="inputGroup-sizing-sm"
><i class="fas fa-search"></i
></span>
<input
type="text"
class="form-control"
aria-describedby="inputGroup-sizing-sm"
aria-label="inputGroup-sizing-sm"
@keyup="search"
v-model="text"
/>
</div>
<div class="form-check border-bottom">
<input
class="form-check-input"
type="checkbox"
v-model="allColumns"
@change="toogleAllColumns"
id="flexCheckDefault"
/>
<label class="form-check-label" for="flexCheckDefault">
{{ $t("ID_ALL") }}
</label>
</div>
<b-form-group>
<b-form-group label-for="settingsPopover">
<b-form-checkbox-group
v-model="localSelected"
:options="options"
@@ -48,13 +44,11 @@
stacked
></b-form-checkbox-group>
</b-form-group>
<div class="v-popover-footer">
<div class="float-right">
<b-button @click="onClose" size="sm" variant="danger">
{{ $t("ID_CANCEL") }}</b-button
>
<b-button @click="onSave" size="sm" variant="success">{{
$t("ID_SAVE")
}}</b-button>

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="xIFrame"
title="xIFrame"
frameborder="0"
:src="path"
:height="height"

View File

@@ -2,6 +2,7 @@
<div
id="home"
:class="[{ collapsed: collapsed }, { onmobile: isOnMobile }]"
role="main"
>
<div class="demo">
<b-alert

View File

@@ -7,6 +7,7 @@
:src="pageUri"
:height="height"
allowfullscreen
title="xIFrame"
></iframe>
</div>
</template>

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="xIFrame"
title="xIFrame"
frameborder="0"
:src="path"
:height="height"

View File

@@ -19,6 +19,7 @@
aria-describedby="inputGroup-sizing-sm"
@keyup="search"
v-model="text"
aria-label="search"
/>
</div>
<div class="form-check border-bottom">
@@ -27,12 +28,13 @@
type="checkbox"
v-model="allColumns"
@change="toogleAllColumns"
id="flexCheckDefault"
/>
<label class="form-check-label" for="flexCheckDefault">
{{ $t("ID_ALL") }}
</label>
</div>
<b-form-group>
<b-form-group label-for="casesFilter">
<b-form-checkbox-group
v-model="localSelected"
:options="results"

View File

@@ -1,5 +1,5 @@
<template>
<div id="v-pm-charts" ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div class="p-1 v-flex">
<h6 class="v-search-title">
{{ $t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS") }}
@@ -70,13 +70,13 @@
</div>
</b-popover>
<div class="vp-inline-block vp-right vp-padding-r40">
<h4
<span
class="v-search-title"
@click="showProcessesPopover"
id="pm-task-process"
>
<i class="fas fa-cog"></i>
</h4>
</span>
</div>
</div>
<div class="v-search-info">

View File

@@ -1,5 +1,5 @@
<template>
<div id="v-pm-charts" ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div class="p-1 v-flex">
<h6 class="v-search-title">
{{ $t("ID_DRILL_DOWN_RISK_MATRIX") }}

View File

@@ -1,5 +1,5 @@
<template>
<div id="v-pm-charts" ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div class="p-1 v-flex">
<h6 class="v-search-title">
{{ $t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK") }}

View File

@@ -1,5 +1,5 @@
<template>
<div id="v-pm-charts" ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div ref="v-pm-charts" class="v-pm-charts vp-inline-block">
<div class="p-1 v-flex">
<h6 class="v-search-title">{{ $t("ID_DRILL_DOWN_NUMBER_TASKS") }}</h6>
<BreadCrumb :options="dataBreadcrumbs" :settings="settingsBreadcrumbs" />

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="xIFrame"
title="xIFrame"
frameborder="0"
:src="path"
:height="height"

View File

@@ -3,6 +3,7 @@
<iframe
:width="width"
ref="xIFrame"
title="xIFrame"
frameborder="0"
:src="path"
:height="height"

Some files were not shown because too many files have changed in this diff Show More