\ No newline at end of file
+
diff --git a/modules/supplier/front/consumption-search-panel/index.html b/modules/supplier/front/consumption-search-panel/index.html
index 597c6edab..5cba11d3c 100644
--- a/modules/supplier/front/consumption-search-panel/index.html
+++ b/modules/supplier/front/consumption-search-panel/index.html
@@ -17,12 +17,11 @@
diff --git a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
index 9ea859f7c..f160cfaac 100644
--- a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
+++ b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
@@ -22,9 +22,13 @@ module.exports = Self => {
}
});
- Self.getItemTypeWorker = async filter => {
+ Self.getItemTypeWorker = async(filter, options) => {
+ const myOptions = {};
const conn = Self.dataSource.connector;
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
const query =
`SELECT DISTINCT u.id, u.nickname
FROM itemType it
diff --git a/modules/ticket/front/search-panel/index.html b/modules/ticket/front/search-panel/index.html
index 52bede97f..d80f21531 100644
--- a/modules/ticket/front/search-panel/index.html
+++ b/modules/ticket/front/search-panel/index.html
@@ -1,7 +1,7 @@
\ No newline at end of file
+
diff --git a/modules/worker/back/methods/worker/activeWithInheritedRole.js b/modules/worker/back/methods/worker/activeWithInheritedRole.js
index 9536b0f29..19038405b 100644
--- a/modules/worker/back/methods/worker/activeWithInheritedRole.js
+++ b/modules/worker/back/methods/worker/activeWithInheritedRole.js
@@ -1,7 +1,7 @@
module.exports = Self => {
Self.remoteMethod('activeWithInheritedRole', {
- description: 'Returns active workers with a role',
+ description: 'Returns active workers with an inherited role',
accessType: 'READ',
accepts: [{
arg: 'filter',
@@ -24,7 +24,7 @@ module.exports = Self => {
`SELECT DISTINCT w.id, w.firstName, w.lastName, u.name, u.nickname
FROM worker w
JOIN account.user u ON u.id = w.userFk
- JOIN account.roleRole i ON i.role = u.role
+ JOIN account.roleRole i ON i.role = u.role
JOIN account.role r ON r.id = i.inheritsFrom`;
return Self.activeWorkers(query, filter);
diff --git a/modules/worker/back/methods/worker/activeWithRole.js b/modules/worker/back/methods/worker/activeWithRole.js
index 392416458..c7f96e151 100644
--- a/modules/worker/back/methods/worker/activeWithRole.js
+++ b/modules/worker/back/methods/worker/activeWithRole.js
@@ -1,7 +1,7 @@
module.exports = Self => {
Self.remoteMethod('activeWithRole', {
- description: 'Returns active workers with an inherited role',
+ description: 'Returns active workers with a role',
accessType: 'READ',
accepts: [{
arg: 'filter',
diff --git a/modules/worker/back/methods/worker/search.js b/modules/worker/back/methods/worker/search.js
new file mode 100644
index 000000000..cd0a466ea
--- /dev/null
+++ b/modules/worker/back/methods/worker/search.js
@@ -0,0 +1,69 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('search', {
+ description: 'Returns an array of search results for a specified worker',
+ accepts: [{
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter to define conditions and paginate the data.',
+ required: true
+ },
+ {
+ arg: 'departmentCodes',
+ type: ['string'],
+ description: 'Department codes to search workers',
+ }],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/search`,
+ verb: 'GET'
+ }
+ });
+
+ Self.search = async(ctx, filter, departmentCodes) => {
+ const models = Self.app.models;
+ const conn = Self.dataSource.connector;
+
+ if (departmentCodes) {
+ const departments = await models.Department.find({
+ fields: ['id', 'sons'],
+ where: {code: {inq: departmentCodes}}
+ });
+
+ const allLeaves = await getAllLeaves(ctx, departments);
+ const where = {'departmentFk': {inq: allLeaves}};
+ filter = mergeFilters(filter, {where});
+ }
+
+ const stmt = new ParameterizedSQL(`
+ SELECT *
+ FROM(
+ SELECT DISTINCT w.id, w.code, u.name, u.nickname, u.active, b.departmentFk
+ FROM worker w
+ JOIN account.user u ON u.id = w.id
+ JOIN business b ON b.workerFk = w.id
+ ) w`);
+
+ stmt.merge(conn.makeSuffix(filter));
+ return conn.executeStmt(stmt);
+ };
+
+ async function getAllLeaves(ctx, departments) {
+ const models = Self.app.models;
+ const leaves = [];
+ for (const department of departments) {
+ if (department.sons > 0) {
+ const subLeaves = await models.Department.getLeaves(ctx, department.id, null);
+ const grandLeaves = await getAllLeaves(ctx, subLeaves);
+ leaves.push(...grandLeaves);
+ }
+ leaves.push(department.id);
+ }
+ return leaves;
+ }
+};
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index b44703a88..ccae3a6e6 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -16,6 +16,7 @@ module.exports = Self => {
require('../methods/worker/new')(Self);
require('../methods/worker/deallocatePDA')(Self);
require('../methods/worker/allocatePDA')(Self);
+ require('../methods/worker/search')(Self);
require('../methods/worker/isAuthorized')(Self);
Self.validatesUniquenessOf('locker', {
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index d89d88f2e..2d85d018d 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -37,14 +37,11 @@
-
-
+
-
-
+
-
-
+
-
+
@@ -78,12 +76,12 @@
label="Fill in days without physical check-ins"
ng-model="$ctrl.department.hasToRefill">
-
-
+
+
-
+