460 Commits

Author SHA1 Message Date
Alex Santos
6d9c49fe5d maintenance input,header 2022-06-27 21:03:10 -03:00
joseCorte-exe
4a08d520f8 add more fix 2022-06-27 20:45:01 -03:00
joseCorte-exe
940c2f0a87 fixing 2022-06-27 16:47:26 -03:00
Alex Santos
99f51b87cc update 2022-06-27 16:24:08 -03:00
Alex Santos
e5bc75c60e update Header 2022-06-27 14:57:03 -03:00
joseCorte-exe
d056493014 add create client with role 2022-06-27 11:14:22 -03:00
Alex Santos
b731c80830 update Header 2022-06-27 10:55:07 -03:00
Alex Santos
78552b5b85 resolv conflicts 2022-06-26 12:24:36 -03:00
Alex Santos
7aff508092 resolv conflicts 2022-06-26 12:23:26 -03:00
joseCorte-exe
4164af9104 resolving conflicts 2022-06-24 20:52:55 -03:00
joseCorte-exe
16b927b42b in a race against the clock 2022-06-24 20:48:09 -03:00
Alex Santos
020fe30314 update Consumption 2022-06-24 19:54:46 -03:00
Alex Santos
b5312d2964 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-24 09:55:07 -03:00
Alex Santos
1f979845a8 update 2022-06-24 09:54:17 -03:00
José Corte
f573b6f269 Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!78
2022-06-24 05:21:28 +00:00
joseCorte-exe
ba7cf92a5b Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-24 02:18:44 -03:00
joseCorte-exe
62bc63d595 fixing 2022-06-24 02:18:15 -03:00
Alex Santos
6c365b17c4 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-23 22:21:53 -03:00
Alex Santos
32b592ce02 support login 2022-06-23 22:21:25 -03:00
joseCorte-exe
8bc13d035b 🎨 change resumo operacao selects position 2022-06-23 17:41:37 -03:00
José Corte
2c0a7f20f8 Merge branch 'administativePages' into 'dev'
fixing input

See merge request kluppsoftware/smart-energia-web!74
2022-06-23 19:57:30 +00:00
joseCorte-exe
048d9f2f10 fixing input 2022-06-23 16:54:31 -03:00
José Corte
c4b80a90cc Merge branch 'administativePages' into 'dev'
fixing bugs

See merge request kluppsoftware/smart-energia-web!71
2022-06-23 19:33:43 +00:00
joseCorte-exe
09ec73d1b4 fixing bugs 2022-06-23 16:31:20 -03:00
José Corte
3556ef31da Merge branch 'administativePages' into 'dev'
add download csv resumo operacao table functionality

See merge request kluppsoftware/smart-energia-web!70
2022-06-23 14:12:20 +00:00
joseCorte-exe
9a7398ff15 add download csv resumo operacao table functionality 2022-06-23 11:02:32 -03:00
José Corte
bb84a6424e Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!69
2022-06-23 13:38:15 +00:00
joseCorte-exe
8eacf7b3e6 fixing industryInfo administrative page 2022-06-23 10:31:58 -03:00
joseCorte-exe
e40626f859 fixing login pages 2022-06-23 10:24:26 -03:00
joseCorte-exe
990e47aa01 fix admin tabls 2022-06-23 10:09:18 -03:00
Alex Santos
0192b2bb28 update 2022-06-23 10:05:47 -03:00
Alex Santos
19f4c6ce23 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-22 15:28:30 -03:00
Alex Santos
1540a1a63a udpate 2022-06-22 15:28:08 -03:00
joseCorte-exe
4159a8096a Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-22 15:26:33 -03:00
joseCorte-exe
85558b1386 fix user logo to api 2022-06-22 15:26:11 -03:00
Alex Santos
41cd2f7b0c update consumo API 2022-06-22 14:19:16 -03:00
Alex Santos
0e5cb5b632 update API 2022-06-22 14:16:59 -03:00
joseCorte-exe
6d48f954b7 push fix 2022-06-22 14:16:23 -03:00
Alex Santos
8c0f803ac1 update Consumiption API 2022-06-22 14:10:00 -03:00
José Corte
3ec2cc423d Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!68
2022-06-21 12:53:47 +00:00
joseCorte-exe
ce4ade1e95 fixing issues pointed out in list 2022-06-20 19:11:22 -03:00
Alex Santos
60a0461d27 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-20 14:50:54 -03:00
Alex Santos
f88dd4fa80 update Modal 2022-06-20 14:50:01 -03:00
joseCorte-exe
51ccc268a1 adding pld maps and percentage in charts 2022-06-20 11:51:04 -03:00
Alex Da Silva Santos
ce59afc095 Merge branch 'administativePages' into 'dev'
update Chart

See merge request kluppsoftware/smart-energia-web!67
2022-06-17 21:07:34 +00:00
Alex Santos
131fa9fbe2 update Chart 2022-06-17 18:04:13 -03:00
Alex Da Silva Santos
c8473002a8 Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!65
2022-06-17 21:00:37 +00:00
Alex Santos
8cad85d9ef update chart 2022-06-17 16:35:56 -03:00
Alex Santos
0396f685f0 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-17 16:29:43 -03:00
Alex Santos
db99880217 udpate chart 2022-06-17 16:29:27 -03:00