From 84d341965601c2a9fcd299ef65eaa718f009b3ca Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 29 Mar 2019 11:58:49 +0100 Subject: [PATCH 1/3] added buscaman icon --- front/core/styles/salixfont.css | 3 +++ front/core/styles/salixfont.svg | 1 + front/core/styles/salixfont.ttf | Bin 23916 -> 24612 bytes front/core/styles/salixfont.woff | Bin 23992 -> 24688 bytes 4 files changed, 4 insertions(+) diff --git a/front/core/styles/salixfont.css b/front/core/styles/salixfont.css index 4ee650d19..09bf5c425 100644 --- a/front/core/styles/salixfont.css +++ b/front/core/styles/salixfont.css @@ -23,6 +23,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-buscaman:before { + content: "\e951"; +} .icon-pbx:before { content: "\e950"; } diff --git a/front/core/styles/salixfont.svg b/front/core/styles/salixfont.svg index 42207cb24..89332991a 100644 --- a/front/core/styles/salixfont.svg +++ b/front/core/styles/salixfont.svg @@ -88,4 +88,5 @@ + \ No newline at end of file diff --git a/front/core/styles/salixfont.ttf b/front/core/styles/salixfont.ttf index 46b210de77ecd9318d8e9a7e4e2f1dca57dc6f5d..c7057654d184e9a91d5b640f45be4befa9de5819 100644 GIT binary patch delta 986 zcmZvb%TE(Q9LHyNyHA?7%eJ!%@{qRdN($}vvAaS5F(qQ4KnTbiq~Up>N=##el`@;%#@W(klG*{@RMZ1GE-XZc^t38fud^o z;~vaG#)FHn4ey#|8#q_j}62C?Mgdx5YVtHm`KiDEd#?N)5!)1anD zv956}2YUeKS4hG(fU@CCN)=WJ49+?$#TC)ee^A><#1p5;DCUArvBFU`$K6R4O$X)J zXB3BMHXum>rynAZN_<|GP;z;7#x{G5T$3wfqaGXGSq(F)nXo}}bJziasWxVN#v6|{aJY64cn2g60ed+e;$_iQ#L?V`zjkL5} zjzl6?>gvuh0>hQK#L-|l+@h6> z!@+}veYYgJ-4g8+(;gM<5Y_LPDmX)@)D$#(GBzBLHqsfpu1!jBHFXPapU+MIxxhRv zdZFTYn}-%QyfRDk95|wRuiP3ryn6!BF1@l+7X^$}wNX`RK@mhTK$0ZD3!(BeVHd?P zLV0(!qEvA_RVvpH!?ys#g5dM%l7vmuAviVD5Ti#a5Ja(4*BHo&Wn$7X;Pj)*2N&?p zkFEWy-saz^#O3_lXz#;D&B?quFk<7uosE$J>;iRd^I-J3zaa&(b8`prM^x#ch}!I% Lkau2=y~qCmllrH= delta 270 zcmZ2-fbq>P#(D-u1_lOhh6V;^1_S?KeItG$wi2Mo9w1Ig&P^;354&`ofq_v5$PYK@C0~IhR z2lCedHOwo>FD?N(6bNE{Chl-&44A~|%^0xRhw*8+GRPl5JYmO{&Uk*CuMFHQAax8k iHu`>t(UVzX%o#&B+r)%0PM#9Gh7IiZ(9K?Pw-^CuZ${++ diff --git a/front/core/styles/salixfont.woff b/front/core/styles/salixfont.woff index 66122fec837f3b09d6a32b09381c9e16de99cddf..f3bdd62f0aa319b93a5df8e1a9f1740369c354ed 100644 GIT binary patch delta 1008 zcmZvb-D}fO7{<>@nkG3bZDZP#Y`V?0UE*lhrXNXk=u|3GT(>#Yed@H#&0bg?Sig}f zdf|l^NvyMY&>-X?$_5Hyonb zjAQ4F&W$+ThQp1j6-xWD2#y~&U>B|p$F&@{4Fm6HXf|w7O~@J1Mi1(!jq57)ie4ja zz(_TVHFtZljsFD=Gl@+@^opjs6F9txP)e51GVb zgf*+yyRmeuT?`W{D>;)m%6r3#5@uRPew_vbI_1=s_JV55V=J73CcE#iI{asxf1X&Q9JY*sgi}f3(xy^P4Ddp;%s_sZ79e(?z%`4De z`*_dc^Nl961J-0*Ac6=dmOuFv#phG_Aj$i6h(q-d3sq&qZlxz;4;EZ_K;Ft1+^%g( z{#MU`>%6SV zgoJ69h9x=LvNq=71VL^YXxFqhQR3F9i7|K=5LlLjK~qt%Z8JjD3*9Mxf`bAfyG=s? zk2I4k3&2$WIpGJr@a@*8LxIgdQIiM0eT0@?U+-9*Yxl=pJTkvDz7Kn#dZm__d_uZ& OP=D0Tcv^Z2|ICK$!gq zi%>>xNd-{s22elH4#p5KM$Xop{A8dyyJ#JtqBS6#bFpPlZej({;%J~k1_dxKW;~pi zn41a|`vKHA4}{~wZ@L%c7ncBiGGpQ&f5w2xK8)Us0h?zqJ`Gm}`4EUF?AX#7&u{aU qftv*=z`$^0qwjYZJvku8oH2BBM@$Ig Date: Fri, 29 Mar 2019 12:07:48 +0100 Subject: [PATCH 2/3] cau 10249 update structure --- db/install/changes/00-workerGetHierarch.sql | 46 +++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 db/install/changes/00-workerGetHierarch.sql diff --git a/db/install/changes/00-workerGetHierarch.sql b/db/install/changes/00-workerGetHierarch.sql new file mode 100644 index 000000000..8070a0ee2 --- /dev/null +++ b/db/install/changes/00-workerGetHierarch.sql @@ -0,0 +1,46 @@ +DROP procedure IF EXISTS `vn`.`worker_getHierarch`; + +DELIMITER $$ +CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`worker_getHierarch`(vBoss INT) +BEGIN + DECLARE EXIT HANDLER FOR 1062 BEGIN + CALL util.throw('INFINITE_LOOP'); + END; + + DROP TEMPORARY TABLE IF EXISTS workerHierarch; + CREATE TEMPORARY TABLE workerHierarch + (PRIMARY KEY (workerFk)) + ENGINE = MEMORY + SELECT vBoss AS workerFk; + + DROP TEMPORARY TABLE IF EXISTS tmp.workerHierarchList; + CREATE TEMPORARY TABLE tmp.workerHierarchList + (PRIMARY KEY (workerFk)) + ENGINE = MEMORY + SELECT vBoss AS workerFk, 0 AS isChecked; + + + WHILE (SELECT COUNT(*) FROM tmp.workerHierarchList WHERE NOT isChecked) > 0 DO + + INSERT INTO tmp.workerHierarchList + SELECT w.id, 0 + FROM worker w + JOIN workerHierarch wh ON wh.workerFk = w.bossFk; + + UPDATE tmp.workerHierarchList whl + JOIN workerHierarch wh ON wh.workerFk = whl.workerFk + SET whl.isChecked = 1; + + TRUNCATE workerHierarch; + + INSERT INTO workerHierarch + SELECT workerFk + FROM tmp.workerHierarchList + WHERE NOT isChecked; + + END WHILE; + + DROP TEMPORARY TABLE IF EXISTS workerHierarch; +END$$ + +DELIMITER ; \ No newline at end of file From 75cb05865bb2ebb74dfe63dcf1e5b6a7c53308aa Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 29 Mar 2019 13:07:06 +0100 Subject: [PATCH 3/3] filter by firstName & lastName --- modules/client/back/methods/client/activeWorkersWithRole.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/client/back/methods/client/activeWorkersWithRole.js b/modules/client/back/methods/client/activeWorkersWithRole.js index 3b0ccaac2..cf0bc6597 100644 --- a/modules/client/back/methods/client/activeWorkersWithRole.js +++ b/modules/client/back/methods/client/activeWorkersWithRole.js @@ -39,7 +39,8 @@ module.exports = Self => { case 'firstName': return {or: [ {'w.firstName': {like: `%${value}%`}}, - {'w.name': {like: `%${value}%`}}, + {'w.lastName': {like: `%${value}%`}}, + {'u.name': {like: `%${value}%`}}, {'u.nickname': {like: `%${value}%`}} ]}; case 'id': @@ -54,7 +55,7 @@ module.exports = Self => { myFilter = mergeFilters(myFilter, clientFilter); let stmt = new ParameterizedSQL( - `SELECT DISTINCT w.id, w.firstName, w.name, u.nickname + `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