 Bhaskar
|
5c6a120d83
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
769ea96c81
|
changes
|
8 months ago |
 Varun
|
76f30eaa94
|
changes
|
8 months ago |
|
Bhaskar
|
a0c6014a79
|
changes
|
8 months ago |
|
Bhaskar
|
b576a853df
|
chnages
|
8 months ago |
|
Bhaskar
|
5825091517
|
chnages
|
8 months ago |
|
Bhaskar
|
5a580b0274
|
chnages
|
8 months ago |
|
Bhaskar
|
82b3364520
|
Changes
|
8 months ago |
|
Bhaskar
|
7e0ed9efce
|
changes
|
8 months ago |
|
Bhaskar
|
5fb1f1a061
|
CHANGES
|
8 months ago |
|
Bhaskar
|
177042fc53
|
changes
|
8 months ago |
|
Bhaskar
|
ceaafb165d
|
changes
|
8 months ago |
|
Bhaskar
|
78ef52eb4f
|
CHNAGES
|
8 months ago |
|
Bhaskar
|
4f1b44ea07
|
lora message added
|
8 months ago |
|
Bhaskar
|
0e6be3f54b
|
CHANGES
|
8 months ago |
|
Bhaskar
|
147a5ab2f7
|
chnages
|
8 months ago |
|
Bhaskar
|
cd84af56f2
|
gsm check and lora time and date update in insensors
|
8 months ago |
|
Bhaskar
|
3bfc0b3367
|
masterName location added in insensors
|
8 months ago |
|
Bhaskar
|
eeedd2b28b
|
status added
|
8 months ago |
|
Bhaskar
|
35d081d9cc
|
changes
|
8 months ago |
|
Bhaskar
|
81f46e1d60
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
ea59f6e637
|
changes
|
8 months ago |
|
Varun
|
0c8719a3c5
|
changes in tanks consumption
|
8 months ago |
|
Varun
|
f9d25e8eba
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
ef5b498825
|
changes in consumption
|
8 months ago |
|
Bhaskar
|
d06cba39af
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
9fb8896a5d
|
master and slave full into list and check all hardwareIds at timein iotdata
|
8 months ago |
|
Varun
|
a03e4557d3
|
changes in motor action,till this the code worked fine
|
8 months ago |
|
Varun
|
ca968ac483
|
changes in motordata
|
8 months ago |
|
Varun
|
d470d627f2
|
changes
|
9 months ago |
|
Varun
|
29fdcee7e3
|
changes
|
9 months ago |
|
Varun
|
63356cac31
|
added favorate suppliers to customer and common get for orders based on orders
|
9 months ago |
|
Varun
|
b4e7fcbe51
|
changes in installation
|
9 months ago |
|
Bhaskar
|
f8c697f88d
|
chnages
|
9 months ago |
|
Bhaskar
|
88e118010e
|
slaves data count
|
9 months ago |
|
Bhaskar
|
2d1017fdc7
|
installationId added in get masterlist
|
9 months ago |
|
Bhaskar
|
7817fcf790
|
user details added in master list
|
9 months ago |
|
Bhaskar
|
f82395bb80
|
get the master list
|
9 months ago |
|
Bhaskar
|
b2376d6f47
|
master connected slave data
|
9 months ago |
|
Bhaskar
|
8a9d1664d1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
5e79fa5a20
|
changes
|
9 months ago |
|
Varun
|
efa92448d5
|
changes
|
9 months ago |
|
Varun
|
471e736f91
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
3af6c64702
|
changes
|
9 months ago |
|
Bhaskar
|
91e7bac1ae
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
2caebb798d
|
material recieved pictures upload
|
9 months ago |
|
Varun
|
e38c93664d
|
changes for start and stop test in install
|
9 months ago |
|
Bhaskar
|
22befe977e
|
material recieved pictures
|
9 months ago |
|
Bhaskar
|
a80eaaf5c6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
dcd83742df
|
message
|
9 months ago |
|
Varun
|
25e2d572b2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
d5b384df7b
|
changes
|
9 months ago |
|
Bhaskar
|
cdb6afd11d
|
elecrticty work and plumbing work pictures apis
|
9 months ago |
|
Bhaskar
|
e6a72ec0a6
|
CHNAGES
|
9 months ago |
|
Bhaskar
|
2e5766792a
|
CHANGES
|
9 months ago |
|
Bhaskar
|
e6073afeb3
|
water level convert to cm and manually easure height apis
|
9 months ago |
|
Bhaskar
|
26b073a23e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
3ade6d5585
|
changes
|
9 months ago |
|
Varun
|
a8ca0e9f4f
|
changes
|
9 months ago |
|
Varun
|
e12bbbbb5d
|
changes
|
9 months ago |
|
Varun
|
febba81f0e
|
changes
|
9 months ago |
|
Varun
|
ba19fba6e0
|
added started by and stopped by in motordata
|
9 months ago |
|
Bhaskar
|
11e76a6d82
|
chnages
|
9 months ago |
|
Bhaskar
|
eb28852382
|
chnages
|
9 months ago |
|
Bhaskar
|
c7d449198b
|
chnages
|
9 months ago |
|
Bhaskar
|
a6b3e28d17
|
chnages
|
9 months ago |
|
Bhaskar
|
28999c5d98
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
dc927c32c4
|
quantity delivired added in stop notification
|
9 months ago |
|
Varun
|
a356f2e263
|
changes in stop motor
|
9 months ago |
|
Varun
|
ee1892de05
|
changes
|
9 months ago |
|
Varun
|
fdc63661b3
|
changes
|
9 months ago |
|
Varun
|
6cc3ed7421
|
changes
|
9 months ago |
|
Varun
|
8cd1c472cf
|
changes in consumption
|
9 months ago |
|
Varun
|
0c063e321b
|
changes in consumption
|
9 months ago |
|
Varun
|
0fbf495853
|
changes
|
9 months ago |
|
Varun
|
348204eb6c
|
changes
|
9 months ago |
|
Varun
|
d12e14e8be
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
3c9a2e4912
|
changes
|
9 months ago |
|
Bhaskar
|
a2b4c251ef
|
message added
|
9 months ago |
|
Bhaskar
|
6fb320d665
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
e290d99ff7
|
message added in measure height
|
9 months ago |
|
Varun
|
b33a945c45
|
change in water/iotdata motor data saving included
|
9 months ago |
|
Bhaskar
|
961fcd2fbf
|
save the master slave data
|
9 months ago |
|
Bhaskar
|
5ba5720fef
|
validate teank height extrem high values
|
9 months ago |
|
Bhaskar
|
05677318db
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
c4e864201a
|
manual mesaure calculation
|
9 months ago |
|
Varun
|
8838b64a92
|
changes
|
9 months ago |
|
Varun
|
6032ccd6c8
|
changes
|
9 months ago |
|
Varun
|
ac7fdcd06c
|
changes in consumption
|
9 months ago |
|
Varun
|
2e59a1a5a8
|
changes
|
9 months ago |
|
Varun
|
b5dcc1bf4c
|
chsnes
|
9 months ago |
|
Bhaskar
|
0b6d4c0ecc
|
areas will be added in zones
|
9 months ago |
|
Bhaskar
|
d37ea75caf
|
reprtingManger self added
|
9 months ago |
|
Bhaskar
|
b92fd287ad
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
e5ba590b11
|
states and cites get apis
|
9 months ago |
|
Varun
|
7c5f7d59bb
|
chnages
|
9 months ago |
|
Varun
|
c442cbf52d
|
changes
|
9 months ago |
|
Varun
|
407370d26f
|
changes
|
9 months ago |
|
Varun
|
8515b26c37
|
changes
|
9 months ago |
|
Varun
|
2f55e2dc81
|
chyanges
|
9 months ago |
|
Varun
|
e7df44c8b2
|
changes
|
9 months ago |
|
Varun
|
296e8c6ba9
|
changes
|
9 months ago |
|
Varun
|
e48f592e95
|
changes
|
9 months ago |
|
Varun
|
183961299a
|
changes
|
9 months ago |
|
Varun
|
256755c1d9
|
motoraction with notifications
|
9 months ago |
|
Bhaskar
|
654fa9792f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
477fedcaaa
|
reverted officename based zones
|
9 months ago |
|
Varun
|
96c781b6f4
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
d57129b857
|
this commit previos one works fine with runtime
|
9 months ago |
|
Bhaskar
|
a13a147ca8
|
comany name and city based zones
|
9 months ago |
|
Bhaskar
|
b8e5ece0b2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
2ca69b0492
|
chnages
|
9 months ago |
|
Varun
|
52670c52fd
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
d7fae9bfc5
|
chanegs in stop
|
9 months ago |
|
Bhaskar
|
a6d72a7a6f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
114c808c82
|
chnages
|
9 months ago |
|
Varun
|
2416ee8566
|
changes
|
9 months ago |
|
Varun
|
dc5b3766b5
|
changes consoles added in motor action for quantity delivered
|
9 months ago |
|
Varun
|
d883fa8f68
|
changes reverted
|
9 months ago |
|
Varun
|
a36c72f09e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
257030e603
|
added runtime in motordata
|
9 months ago |
|
Bhaskar
|
33ef8d8bc8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
c001f184f3
|
nameoftheContactPerson added in new branch account
|
9 months ago |
|
Varun
|
731a172ea9
|
changes
|
9 months ago |
|
Varun
|
4fa456793f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
248aa469b8
|
changes
|
9 months ago |
|
Bhaskar
|
7766665de3
|
chnages
|
9 months ago |
|
Bhaskar
|
542235150d
|
forced manual stop notifications chmages
|
9 months ago |
|
Bhaskar
|
4e419f79e3
|
forced manual notifications
|
9 months ago |
|
Bhaskar
|
97128080e0
|
low water levels notification
|
9 months ago |
|
Bhaskar
|
126075f5aa
|
low and critical alert notifications
|
9 months ago |
|
Bhaskar
|
62832705fb
|
chnages
|
9 months ago |
|
Bhaskar
|
020421b516
|
notifications added
|
9 months ago |
|
Varun
|
776586ece4
|
changes
|
9 months ago |
|
Varun
|
17ec6115a8
|
back to normal with notifications
|
9 months ago |
|
Varun
|
8650905cb8
|
all notifications committed
|
9 months ago |
|
Varun
|
777d1f045d
|
changes
|
9 months ago |
|
Varun
|
340ded5935
|
changes
|
9 months ago |
|
Varun
|
4b7eb8337b
|
changes
|
9 months ago |
|
Varun
|
e4cde7ab31
|
changed
|
9 months ago |
|
Varun
|
30c6ebbe96
|
changes notifications committed
|
9 months ago |
|
Varun
|
af78a1abb2
|
changes in accept quotation
|
9 months ago |
|
Varun
|
39c747147a
|
added master_connections in survey
|
9 months ago |
|
Varun
|
bed71e281a
|
changes
|
9 months ago |
|
Varun
|
b01a3afe71
|
previous motoraction code
|
9 months ago |
|
Varun
|
d42215b26c
|
previous motoraction code
|
9 months ago |
|
Varun
|
2e613157fb
|
changes
|
9 months ago |
|
Varun
|
a56de05de1
|
changes
|
9 months ago |
|
Varun
|
100b418a74
|
changes
|
9 months ago |
|
Varun
|
4705396234
|
changes
|
9 months ago |
|
Varun
|
780d1f4178
|
changes
|
9 months ago |
|
Varun
|
5c037fdfef
|
changes for testing in time in motoraction
|
9 months ago |
|
Varun
|
51fa49916e
|
changes made
|
9 months ago |
|
Varun
|
537f1ba515
|
reverted motor action
|
9 months ago |
|
Varun
|
60387eb70e
|
notifications comminted
|
9 months ago |
|
Varun
|
d193d62c2e
|
changes
|
9 months ago |
|
Varun
|
e2800f416c
|
changes reverted on mqtt
|
9 months ago |
|
Varun
|
65de89a44f
|
changes
|
9 months ago |
|
Varun
|
55b207f076
|
changes reverted in mqtt
|
9 months ago |
|
Varun
|
992eab6eba
|
changes
|
9 months ago |
|
Varun
|
827b9406e9
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
2a70267319
|
changes
|
9 months ago |
|
Bhaskar
|
1ece7f295b
|
chnages
|
9 months ago |
|
Varun
|
7c45defdf5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
85e0537479
|
changes
|
9 months ago |
|
Bhaskar
|
927f501572
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
989cfcdf52
|
changes
|
9 months ago |
|
Varun
|
ca6799566d
|
changes
|
9 months ago |
|
Varun
|
0ba2d740f5
|
changes
|
9 months ago |
|
Varun
|
40ea912908
|
changes
|
9 months ago |
|
Varun
|
0b107a6785
|
changes in water/iot-data/announce
|
9 months ago |
|
Varun
|
1688140794
|
changes
|
9 months ago |
|
Varun
|
b6225d24fb
|
changes
|
9 months ago |
|
Varun
|
ab8b71fa0b
|
changes in motoraction
|
9 months ago |
|
Varun
|
2aa62e7d6c
|
changes
|
9 months ago |
|
Varun
|
8d084b6a83
|
changes in motor action
|
9 months ago |
|
Varun
|
eb43c610db
|
changes
|
9 months ago |
|
Varun
|
15ca1da7de
|
changes in qc
|
9 months ago |
|
Varun
|
8996cfad0c
|
changes in mqtt
|
9 months ago |
|
Varun
|
4913768188
|
changes
|
9 months ago |
|
Bhaskar
|
7b4d3b8d8a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
9cc4dc0a2f
|
allocated sensors
|
9 months ago |
|
Varun
|
26fbb6f507
|
changes in qc check
|
9 months ago |
|
Varun
|
c9c80655e1
|
changes
|
9 months ago |
|
Varun
|
29c85b90b5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
c0bba501b5
|
get details of particular hardwareId
|
9 months ago |
|
Bhaskar
|
870e531dc9
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
e43767b9b0
|
LORA and GSM check apis
|
9 months ago |
|
Varun
|
a996574402
|
changes
|
9 months ago |
|
Varun
|
380850af89
|
changes
|
9 months ago |
|
Varun
|
c2372897c6
|
changes
|
9 months ago |
|
Varun
|
76cb85ee76
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
ba36f50f2e
|
dynamically creating hardwareid and masterid
|
9 months ago |
|
Bhaskar
|
5bb68828cb
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
72daff3ca4
|
allocated sensors display
|
9 months ago |
|
Varun
|
ea28c0067c
|
changes
|
9 months ago |
|
Varun
|
aba4cc9330
|
changes
|
9 months ago |
|
Varun
|
a6b73f611c
|
changes
|
9 months ago |
|
Varun
|
65c941386f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
d721b4d37c
|
changes
|
9 months ago |
|
Bhaskar
|
6b98420c96
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
b27bfea441
|
commented on sendthrold notification
|
9 months ago |
|
Varun
|
7a72a2d6b4
|
changes in mqtt working
|
9 months ago |
|
Bhaskar
|
f85ac6efef
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
17ab7921bc
|
name based get
|
9 months ago |
|
Varun
|
c195ef5517
|
changes
|
9 months ago |
|
Varun
|
ff24a2157f
|
changes
|
9 months ago |
|
Varun
|
ab7b00ea13
|
changes in mqtt
|
9 months ago |
|
Bhaskar
|
887f6858de
|
CAHNGES
|
9 months ago |
|
Bhaskar
|
762c6e0c07
|
get team members by departmentId
|
9 months ago |
|
Bhaskar
|
a4e8253945
|
changes
|
9 months ago |
|
Bhaskar
|
f71fd30f85
|
get orders by installationId
|
9 months ago |
|
Bhaskar
|
c5dfa45709
|
team member login changes creation
|
9 months ago |
|
Bhaskar
|
c150a8283d
|
changes
|
9 months ago |
|
Bhaskar
|
de81793c5d
|
name adde in team member login
|
9 months ago |
|
Bhaskar
|
b9438b9322
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Bhaskar
|
db9db4b8b1
|
assigned team member added in order schema
|
9 months ago |
|
Varun
|
6ffab39227
|
changes
|
9 months ago |
|
Varun
|
17aa0ad416
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
9 months ago |
|
Varun
|
969fdaf1ac
|
changes
|
9 months ago |
|
Varun
|
8161b8b48c
|
changes
|
9 months ago |
|
Bhaskar
|
742445005e
|
changes
|
9 months ago |
|
Bhaskar
|
a81685ad49
|
team member login insatllationId field added
|
9 months ago |
|
Bhaskar
|
1a7d82a23f
|
chnages
|
9 months ago |
|
Bhaskar
|
7321fcd8b2
|
commit forced manual
|
10 months ago |
|
Bhaskar
|
d142d808ff
|
chnages
|
10 months ago |
|
Bhaskar
|
0caef82821
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
dd7aa1e24e
|
get all quations based on installation and team member
|
10 months ago |
|
Varun
|
a09fdbd1ba
|
changes
|
10 months ago |
|
Varun
|
4e8f70ff16
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
3ff82be367
|
changes in get based on status of in sensors
|
10 months ago |
|
Bhaskar
|
3d33e2e465
|
status maintain in order schema
|
10 months ago |
|
Bhaskar
|
55310b1407
|
installer assigned quation teamMember
|
10 months ago |
|
Bhaskar
|
6f93671e64
|
forced manual notifications
|
10 months ago |
|
Bhaskar
|
6e5fcba6b8
|
forced manually notifications
|
10 months ago |
|
Varun
|
7b53eae263
|
changes
|
10 months ago |
|
Varun
|
b34e475982
|
changes
|
10 months ago |
|
Varun
|
9b77ef5728
|
changes
|
10 months ago |
|
Varun
|
268e04b8ec
|
assigning installationId to order
|
10 months ago |
|
Varun
|
703197fd66
|
changes in get quotations of particular user
|
10 months ago |
|
Varun
|
e4e94f53d3
|
added allocated sensors to orders
|
10 months ago |
|
Varun
|
f43bfe1009
|
changes
|
10 months ago |
|
Varun
|
49a3f1fe1d
|
changes
|
10 months ago |
|
Varun
|
f92386ea2a
|
changes
|
10 months ago |
|
Varun
|
45e47e6d4d
|
changes
|
10 months ago |
|
Varun
|
a0429afc6d
|
changes in accept
|
10 months ago |
|
Varun
|
2dfbc8c640
|
changes in mqtt reverted
|
10 months ago |
|
Varun
|
b0d851bc8d
|
changes
|
10 months ago |
|
Varun
|
22bb6a4bc4
|
changes
|
10 months ago |
|
Varun
|
a3480c5d67
|
changes
|
10 months ago |
