 Bhaskar
|
b3f9043f08
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
80da6870d2
|
department names by city
|
10 months ago |
 Varun
|
38eafcbad7
|
changes
|
10 months ago |
|
Varun
|
25be89d52c
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
9445d237b2
|
added all motor access to staff
|
10 months ago |
|
Bhaskar
|
ace4629131
|
get departments to added city in pathparams
|
10 months ago |
|
Bhaskar
|
ea444dc8bb
|
chnages
|
10 months ago |
|
Bhaskar
|
e3fffb8ab9
|
chnages
|
10 months ago |
|
Bhaskar
|
7145831d8f
|
fileds added in department schmea
|
10 months ago |
|
Bhaskar
|
71d59c0aa2
|
trim the ofice name
|
10 months ago |
|
Bhaskar
|
9c3ece1952
|
get city based on office name
|
10 months ago |
|
Bhaskar
|
a8fdd451e8
|
get all company names based on city schmea
|
10 months ago |
|
Bhaskar
|
5cf9fcfc4e
|
branch create, delete, edit
|
10 months ago |
|
Bhaskar
|
aed062e573
|
email added in city chnages
|
10 months ago |
|
Varun
|
4e122b0246
|
changes in consumption
|
10 months ago |
|
Varun
|
8cfce56159
|
changes
|
10 months ago |
|
Varun
|
7ac11bc0d7
|
changes
|
10 months ago |
|
Varun
|
fbc337e142
|
changes in motordata
|
10 months ago |
|
Varun
|
db1f524ab9
|
changes in response in cinsumption
|
10 months ago |
|
Varun
|
30bd1c5283
|
changes in consumption
|
10 months ago |
|
Varun
|
2073783c05
|
added get pumps and users
|
10 months ago |
|
Bhaskar
|
47f4522793
|
zones sorting
|
10 months ago |
|
Bhaskar
|
2cf3a53602
|
changes
|
10 months ago |
|
Bhaskar
|
a95e8e3d7e
|
trim the city values
|
10 months ago |
|
Bhaskar
|
ed5dc15a55
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
586df75d02
|
fetch the locations based on zone ANd city
|
10 months ago |
|
Varun
|
982b8947f3
|
change password
|
10 months ago |
|
Varun
|
ed9a155849
|
changes in motordata
|
10 months ago |
|
Varun
|
ec0ed4ab75
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
71227be09a
|
changes in motordata
|
10 months ago |
|
Bhaskar
|
1940117694
|
get all department names
|
10 months ago |
|
Bhaskar
|
af814bd203
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
822d86a902
|
based on department name to get the list
|
10 months ago |
|
Varun
|
9f03a62bf1
|
added get for automode default percentages for particular customer
|
10 months ago |
|
Varun
|
bf1568c7d4
|
changes
|
10 months ago |
|
Varun
|
75d6f5d19e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
c51dd7e787
|
changes in auto_percentage
|
10 months ago |
|
Bhaskar
|
1ecd4b149c
|
based on city to get the zones
|
10 months ago |
|
Bhaskar
|
46f30f5b39
|
changes
|
10 months ago |
|
Bhaskar
|
c34c3b41c9
|
changes
|
10 months ago |
|
Varun
|
56ee1db55b
|
changes in get tank levels
|
10 months ago |
|
Varun
|
70dff1063f
|
changes in iot-data
|
10 months ago |
|
Varun
|
57a4995308
|
changes reverted to normal
|
10 months ago |
|
Varun
|
a442382263
|
changes
|
10 months ago |
|
Varun
|
8396b0ea19
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
5370ebf149
|
reverted code from jayesh home last visited 25-01-2025
|
10 months ago |
|
Bhaskar
|
ede050d356
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
1ee73f44b6
|
zone base locations
|
10 months ago |
|
Varun
|
1b60e2eab0
|
checking
|
10 months ago |
|
Varun
|
45a03f5aac
|
checking motoraction
|
10 months ago |
|
Varun
|
1e9272faab
|
changes in stop time in motoraction
|
10 months ago |
|
Varun
|
abe8f01233
|
changes reverted list of tanks
|
10 months ago |
|
Varun
|
1a4a35bb38
|
changes
|
10 months ago |
|
Varun
|
8bf4796857
|
changes
|
10 months ago |
|
Varun
|
83135549c9
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
447fee8460
|
changes in tanks active and inactive status
|
10 months ago |
|
Bhaskar
|
55aa30a21d
|
changes
|
10 months ago |
|
Varun
|
d5e27ef501
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
f3a120c1d9
|
added acxtive and inactive in tanks
|
10 months ago |
|
Bhaskar
|
6515647b9e
|
evey six hours report tanks
|
10 months ago |
|
Varun
|
440833dde5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
bc8c5e750c
|
changes in get motordata
|
10 months ago |
|
Bhaskar
|
8eaad995a9
|
chnages
|
10 months ago |
|
Bhaskar
|
bfdd66c68a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
45565401a7
|
changes
|
10 months ago |
|
Varun
|
fb7b4e8751
|
changes in get motordata ,added user name
|
10 months ago |
|
Varun
|
92bf80d5c4
|
changes
|
10 months ago |
|
Varun
|
c0ea44e04b
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
1f40da9645
|
changes in motordata
|
10 months ago |
|
Bhaskar
|
de57e6c38b
|
zone and city based location
|
10 months ago |
|
Bhaskar
|
11f5e32c95
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
30aea23ee4
|
automatic notification
|
10 months ago |
|
Varun
|
40b31f0c73
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
08b6f134d6
|
changes
|
10 months ago |
|
Varun
|
2471c903f2
|
changes in motor data
|
10 months ago |
|
Bhaskar
|
600b0a00ea
|
cities and zones and locations in admin
|
10 months ago |
|
Varun
|
80a4775e2a
|
changes in auto mode
|
10 months ago |
|
Bhaskar
|
7d6c1a5544
|
locations list in admin
|
10 months ago |
|
Bhaskar
|
321e09cd5b
|
notification chnages
|
10 months ago |
|
Varun
|
ee968ce27d
|
changes
|
10 months ago |
|
Bhaskar
|
511b790b66
|
get all zones and cities
|
10 months ago |
|
Bhaskar
|
6cd325634d
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
165bd6ff9e
|
changes start and stop
|
10 months ago |
|
Varun
|
edeae05743
|
changes
|
10 months ago |
|
Varun
|
a7488d4236
|
changes
|
10 months ago |
|
Varun
|
70310c8435
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
72a278ae6c
|
changes
|
10 months ago |
|
Bhaskar
|
15d08db0bf
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
adfd395718
|
changes
|
10 months ago |
|
Varun
|
3979e22b7f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
45c5917ae9
|
changes in consumption
|
10 months ago |
|
Bhaskar
|
1806a3f39a
|
forced manual notification
|
10 months ago |
|
Varun
|
f29eafb1bd
|
low water threshold changesd to 5 from 20
|
10 months ago |
|
Varun
|
637d4a82cd
|
changes reverted for testing in mqtt iot-data
|
10 months ago |
|
Varun
|
6b26b74dac
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
71592afbd1
|
changes in consumption
|
10 months ago |
|
Bhaskar
|
420beaffb6
|
changes
|
10 months ago |
|
Bhaskar
|
a831fb1093
|
high water level notifications
|
10 months ago |
|
Bhaskar
|
ae412ab65d
|
chnages
|
10 months ago |
|
Bhaskar
|
2bec7f3e0b
|
notification changes fix mulitiple
|
10 months ago |
|
Bhaskar
|
dea38e44e8
|
chnages
|
10 months ago |
|
Varun
|
167d04aabb
|
changes
|
10 months ago |
|
Bhaskar
|
9e461225ff
|
notications
|
10 months ago |
|
Varun
|
ab5cd7d376
|
changes
|
10 months ago |
|
Varun
|
397822ee44
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
01682ecd67
|
added total capacities and some changes in consumption
|
10 months ago |
|
Bhaskar
|
2d8e1e21d7
|
schedule time based notifications to send all tanks details
|
10 months ago |
|
Varun
|
539bb63044
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
f0e897076b
|
changes in motoraction and added all motor is on functionality
|
10 months ago |
|
Bhaskar
|
12998d577a
|
changes
|
10 months ago |
|
Bhaskar
|
9773bb3f7c
|
changes
|
10 months ago |
|
Bhaskar
|
8e6900e6c7
|
chnages
|
10 months ago |
|
Bhaskar
|
a1f518fdf2
|
chnages
|
10 months ago |
|
Bhaskar
|
d8f8f0ed2f
|
notification manualmethods
|
10 months ago |
|
Bhaskar
|
7922c364a1
|
notification chnages
|
10 months ago |
|
Bhaskar
|
a25023fadc
|
notification changes
|
10 months ago |
|
Bhaskar
|
db73fe5786
|
changes
|
10 months ago |
|
Bhaskar
|
45a0b540a1
|
notifications changes
|
10 months ago |
|
Varun
|
4f51941292
|
motor action reverted
|
10 months ago |
|
Bhaskar
|
d236c9165f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
cae661a552
|
forgot password response chnages
|
10 months ago |
|
Varun
|
c698bbbd5c
|
changes
|
10 months ago |
|
Varun
|
6661ba9cec
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Varun
|
88a9ca0501
|
changes in motoraction
|
10 months ago |
|
Bhaskar
|
27b94299e0
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
10 months ago |
|
Bhaskar
|
59bb6b1019
|
manual method changes
|
10 months ago |
|
Varun
|
40eae962e0
|
changes
|
10 months ago |
|
Varun
|
587dabdf9f
|
changes in water level updating when tank height received is zero
|
10 months ago |
|
Varun
|
81d6a97e7f
|
added physical motor start to mqtt sub data
|
10 months ago |
|
Bhaskar
|
63e842b9d6
|
notifications changes
|
10 months ago |
|
Bhaskar
|
d5426f9586
|
notifications chnages
|
10 months ago |
|
Bhaskar
|
e35296c0a3
|
multiple fcmIds added
|
11 months ago |
|
Bhaskar
|
a11f695867
|
low and high water levels
|
11 months ago |
|
Varun
|
9f5ed26999
|
reverted forgot password
|
11 months ago |
|
Varun
|
9d841e3897
|
cahnges
|
11 months ago |
|
Varun
|
6a74807380
|
changes reverted
|
11 months ago |
|
Varun
|
8b3ef81b21
|
changes
|
11 months ago |
|
Varun
|
0fba240cb6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Varun
|
15a035c310
|
changes in login ,added staff login to main login
|
11 months ago |
|
Bhaskar
|
5eaf5cecb4
|
changes
|
11 months ago |
|
Varun
|
76c047e26b
|
changes in login
|
11 months ago |
|
Bhaskar
|
b2c6505953
|
changes
|
11 months ago |
|
Bhaskar
|
a172a8b71d
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Bhaskar
|
6fc50d716d
|
notification changes
|
11 months ago |
|
Varun
|
9d122ad358
|
staff phone unique
|
11 months ago |
|
Varun
|
04b49063b0
|
changes in user.js
|
11 months ago |
|
Varun
|
f153f006b1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Bhaskar
|
346d766977
|
notification message
|
11 months ago |
|
Varun
|
e7719d4e4d
|
test
|
11 months ago |
 gitadmin
|
718a45413e
|
dblocal
|
11 months ago |
|
Bhaskar
|
886d2971ec
|
chnages
|
11 months ago |
|
Bhaskar
|
b58c116bca
|
notification changes and forgot password chnages
|
11 months ago |
|
Varun
|
a87c730650
|
changes
|
11 months ago |
|
Varun
|
a29b754cc5
|
added create,edit and delete, block staff
|
11 months ago |
|
Varun
|
37f68e91ae
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Varun
|
09abf286c4
|
add edit and delete satff
|
11 months ago |
|
Bhaskar
|
af0a2797b5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Bhaskar
|
0951776ec8
|
forgot password and change password and verify otp
|
11 months ago |
|
Varun
|
06836c4fe3
|
changes
|
11 months ago |
|
Varun
|
e9e9164823
|
changes reverted
|
11 months ago |
|
Varun
|
857218022d
|
changes in get iots of particular store
|
11 months ago |
|
Varun
|
27d9066f97
|
reverted mqtt
|
11 months ago |
|
Varun
|
ea7448bfe4
|
reverted mqtt
|
11 months ago |
|
Varun
|
023a1398ef
|
changes in mqtt and added get sensors of particular store
|
11 months ago |
|
Varun
|
5c7ab91a5e
|
changes in mqtt
|
11 months ago |
|
Varun
|
845729fbb2
|
changes
|
11 months ago |
|
Varun
|
b01f54cc92
|
changes in get batch numbers
|
11 months ago |
|
Varun
|
d4f94b937f
|
CHANGES
|
11 months ago |
|
Varun
|
b09357dee3
|
changes
|
11 months ago |
|
Varun
|
031754f948
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Varun
|
8c82d3e7f2
|
changes in creating batch number for sensors
|
11 months ago |
|
Bhaskar
|
bca4ae0f3d
|
admin login changes
|
11 months ago |
|
Bhaskar
|
0ee006466f
|
department creation for admin
|
11 months ago |
|
Varun
|
bcd01dff84
|
changes
|
11 months ago |
|
Varun
|
a3e91270d6
|
test1
|
11 months ago |
|
Varun
|
44fa88e3dc
|
changes in motoraction
|
11 months ago |
|
Varun
|
21b6cd5117
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Varun
|
e055df7b6b
|
changes in motoraction
|
11 months ago |
|
Bhaskar
|
318dffff18
|
designation creation
|
11 months ago |
|
Bhaskar
|
7ec03eea6e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
11 months ago |
|
Bhaskar
|
9372eeb3e0
|
admin city creation
|
11 months ago |
|
Varun
|
c884c64d27
|
changes in consumption
|
11 months ago |
|
Varun
|
9a510b0bff
|
edit quotation
|
11 months ago |
|
Varun
|
5487d6b40c
|
date format changed in create quotation
|
11 months ago |
|
Varun
|
8b7c180a58
|
changes in api.html
|
11 months ago |
|
Varun
|
2b879f1ecf
|
changes in c reating quotation
|
11 months ago |
|
Varun
|
6cfc8ee708
|
test9
|
11 months ago |
|
Varun
|
cc565c97fa
|
test8
|
11 months ago |
|
Varun
|
0b7d4e7e37
|
test6
|
11 months ago |
|
Varun
|
5d07639528
|
test5
|
11 months ago |
|
Varun
|
d5956253e9
|
test4
|
11 months ago |
|
Varun
|
3ffa5fa7fb
|
test4
|
11 months ago |
|
Varun
|
b97b5ca1b9
|
test3
|
11 months ago |
|
Varun
|
6aa241e820
|
test1
|
11 months ago |
|
Varun
|
0adb79e6f0
|
test
|
11 months ago |
|
Varun
|
c09359177f
|
get quotations
|
11 months ago |
|
Varun
|
b90735fbbf
|
changes in quotation
|
11 months ago |
|
Varun
|
66119997b4
|
changed electricals in quotation
|
11 months ago |
|
Varun
|
684dbcadec
|
added total sensor count in get tanks
|
11 months ago |
|
Varun
|
4903e2a4a8
|
added total switch count to get tanks
|
11 months ago |
