 varun
|
cee726aa9a
|
modified connections
|
2 years ago |
|
varun
|
627286e52b
|
changes in change motorstatus
|
2 years ago |
|
varun
|
e621b2171f
|
changed motor status read and write
|
2 years ago |
|
varun
|
bcd19ab345
|
changed motor status read and write
|
2 years ago |
|
varun
|
860a4e47a7
|
changed motor status read and write
|
2 years ago |
|
varun
|
c85c87ca72
|
read motor_status changed to motor_stop_status
|
2 years ago |
|
varun
|
910ff604df
|
write motor status for sensor
|
2 years ago |
|
varun
|
8c7a430ac1
|
write motor status for sensor
|
2 years ago |
|
varun
|
8d7de1ac5e
|
write motor status for sensor
|
2 years ago |
|
varun
|
d493ddbd3c
|
write motor status for sensor
|
2 years ago |
|
varun
|
11777a1aaa
|
change in write motor statusac
|
2 years ago |
|
varun
|
e0cc0b1f14
|
change in write motor statusac
|
2 years ago |
|
varun
|
23f9b9c65a
|
change in write motor statusac
|
2 years ago |
|
varun
|
19a2b92b79
|
change in write motor status
|
2 years ago |
|
varun
|
5392fa0162
|
change in read motor status
|
2 years ago |
|
varun
|
5ad517d682
|
changes in read and write motor
|
2 years ago |
|
varun
|
60c109710d
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
5f4fe489e6
|
changes in read and write motor
|
2 years ago |
 bhaskar
|
ebb0fc1050
|
read and write changes
|
2 years ago |
|
bhaskar
|
609598a1b2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
95b77c9891
|
user handler password error
|
2 years ago |
|
varun
|
48e331d3a6
|
changes in read motor status
|
2 years ago |
|
varun
|
ee8bd5a426
|
changes in verify user
|
2 years ago |
|
varun
|
882402965d
|
changes in verify user
|
2 years ago |
|
varun
|
2b7b7d44f0
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
378e2c45c6
|
read write and get motor status
|
2 years ago |
 gitadmin
|
86c405571a
|
Update 'src/controllers/tanksController.js'
|
2 years ago |
|
varun
|
39404e6cfb
|
write motor status
|
2 years ago |
|
bhaskar
|
bd50f4c8e6
|
read and write motor status
|
2 years ago |
|
bhaskar
|
7477b29eb3
|
read and write the motor status
|
2 years ago |
|
varun
|
8934e557b3
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
2ebbb54304
|
database url changed
|
2 years ago |
|
gitadmin
|
1c6a376185
|
Update 'src/config/config.js'
|
2 years ago |
|
gitadmin
|
62ed3b917f
|
Update 'src/config/config.js'
|
2 years ago |
|
gitadmin
|
6bb9105cf9
|
Update 'src/controllers/tanksController.js'
|
2 years ago |
|
gitadmin
|
81639553d9
|
Update 'src/index.js'
|
2 years ago |
|
gitadmin
|
3ce216104d
|
Update 'src/controllers/userController.js'
|
2 years ago |
|
bhaskar
|
f411781420
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
31b41bb458
|
CHANGE
|
2 years ago |
|
varun
|
8a8bac6ba5
|
motor iot switch get,create
|
2 years ago |
|
bhaskar
|
8813a1462b
|
PICTURE added in friend req connected
|
2 years ago |
 raj
|
a666eff8f4
|
Added new feature
|
2 years ago |
|
varun
|
ecd7692216
|
made changes in tank
|
2 years ago |
|
varun
|
99fb76b488
|
made changes in tank
|
2 years ago |
|
varun
|
35637b89ba
|
hardware integration to tank
|
2 years ago |
|
varun
|
40a600f1ea
|
made changes in iot create data
|
2 years ago |
|
varun
|
74c5202f9d
|
made changes in iot create data
|
2 years ago |
|
varun
|
c23bcb9495
|
made changes in iot create data
|
2 years ago |
|
varun
|
cf70001a5e
|
made changes in iot create data
|
2 years ago |
|
varun
|
7fd37b9065
|
made changes in iot create data
|
2 years ago |
|
varun
|
5fc6e57d9f
|
made changes in iot create data
|
2 years ago |
|
varun
|
87f8c1484e
|
made changes in iot create data
|
2 years ago |
|
varun
|
2a99a49608
|
storing only 3 records based on hardwareid
|
2 years ago |
|
varun
|
f820e98db9
|
create iot data
|
2 years ago |
|
varun
|
cb7bdf9c2a
|
consumption
|
2 years ago |
|
varun
|
cb7695b84d
|
changes regarding iot data
|
2 years ago |
|
varun
|
b2d4fd48b9
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
cfe1351d63
|
changes regarding iot data
|
2 years ago |
|
bhaskar
|
2b7a33f517
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
3de4ca38b5
|
profilepicture stored in cloud
|
2 years ago |
|
varun
|
eaaf9f1216
|
test123455
|
2 years ago |
|
bhaskar
|
e9a90ca227
|
change
|
2 years ago |
|
varun
|
b101226d4f
|
test123455
|
2 years ago |
|
varun
|
7eb3013e23
|
test1234
|
2 years ago |
|
varun
|
854b5680de
|
test123
|
2 years ago |
|
varun
|
1f53d5f2c2
|
test1
|
2 years ago |
|
varun
|
7370aed299
|
test1
|
2 years ago |
|
varun
|
44bb8a97d3
|
test
|
2 years ago |
|
varun
|
18353efb06
|
iot devices for multiple
|
2 years ago |
|
varun
|
d006a23e65
|
iot devices for multiple
|
2 years ago |
|
varun
|
702edb712a
|
CONSUMPTION
|
2 years ago |
|
varun
|
ab7fb241b1
|
motoaction
|
2 years ago |
|
varun
|
86e271774c
|
added tank hardware id in iot data
|
2 years ago |
|
varun
|
96cb6e857b
|
added tank hardware id in iot data
|
2 years ago |
|
varun
|
4eab256817
|
WRITTEN GET MOTOR DATA OF PARTICULAR USER
|
2 years ago |
|
varun
|
127251e2eb
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
92ae56ce5f
|
made changes in start and stop and conmsumption
|
2 years ago |
|
bhaskar
|
99fc27d00a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
a47066d787
|
profile picture supplier
|
2 years ago |
|
varun
|
198275668e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
91069a90ef
|
code for deleting motordata
|
2 years ago |
|
bhaskar
|
e2743a3712
|
change
|
2 years ago |
|
bhaskar
|
f7101cf39a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
5c1fe0fe86
|
profile picture
|
2 years ago |
|
varun
|
f9a4ef7b4e
|
made changes in tankscontroller
|
2 years ago |
|
varun
|
359961de01
|
made changes in tankscontroller
|
2 years ago |
|
varun
|
57f373493a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
ab1e4ab5fc
|
made changes in tankscontroller
|
2 years ago |
|
bhaskar
|
4420562f10
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
4596570b4f
|
type changes
|
2 years ago |
|
varun
|
ec7548593b
|
made changes in start and stop
|
2 years ago |
|
varun
|
d98e69aae0
|
made changes in start and stop
|
2 years ago |
|
varun
|
b787c96327
|
made changes in start and stop
|
2 years ago |
|
varun
|
b498c9f226
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
f5e219edf5
|
added stop_at
|
2 years ago |
|
bhaskar
|
b2570e75f3
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
e2c07fbf22
|
tank levels sum waterlevel and capacity
|
2 years ago |
|
varun
|
2b54fefbaa
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
ee3a7784a1
|
made sump to sump start and stop
|
3 years ago |
|
bhaskar
|
9c5bbf73ce
|
CONNECTION changes
|
3 years ago |
|
bhaskar
|
fde99df018
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
ec6c88e407
|
change
|
3 years ago |
|
varun
|
ea98c921d4
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
0c275de032
|
made sump to sump start and stop
|
3 years ago |
|
bhaskar
|
dd902b1482
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
ace8733bfd
|
changes
|
3 years ago |
|
varun
|
214abaa4f5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
b7a69e0517
|
made sump to sump start and stop
|
3 years ago |
|
bhaskar
|
a0af834625
|
connection issue
|
3 years ago |
|
bhaskar
|
1602dbbf03
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
e0944efdb4
|
change
|
3 years ago |
|
bhaskar
|
2f2ce11202
|
change
|
3 years ago |
|
varun
|
d7ee584aeb
|
made sump to sump start and stop
|
3 years ago |
|
varun
|
59d8be500a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
56e4b322bf
|
made sump to sump start and stop
|
3 years ago |
|
raj
|
16a6f4261b
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
raj
|
224c221e60
|
changes
|
3 years ago |
|
bhaskar
|
6ab3117307
|
changes create connection
|
3 years ago |
|
bhaskar
|
d2fdcfbcd8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
b4d7e90013
|
changes
|
3 years ago |
|
bhaskar
|
ac62f7fced
|
changes
|
3 years ago |
|
varun
|
78e4b3844f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
a941c7e5bc
|
test
|
3 years ago |
|
bhaskar
|
52376c0bee
|
test
|
3 years ago |
|
bhaskar
|
611b810cd8
|
test
|
3 years ago |
|
bhaskar
|
184d1d1007
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
d73a781c34
|
changes
|
3 years ago |
|
varun
|
9864359884
|
made medicine details
|
3 years ago |
|
varun
|
879c4d23d6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
0a0720f787
|
added sump to sump connection
|
3 years ago |
|
bhaskar
|
b5b90e80da
|
change
|
3 years ago |
|
bhaskar
|
e02d669fe0
|
inputconnection ismotor issue
|
3 years ago |
|
bhaskar
|
df3b1af3b7
|
ismotor added update connection
|
3 years ago |
|
bhaskar
|
17dfa970bf
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
aaa5e2c370
|
inputismotor and outputismotor feilds are added
|
3 years ago |
|
varun
|
2de9460631
|
made changes in distrubance amount
|
3 years ago |
|
varun
|
da98313cd9
|
made changes in tanks start and stop
|
3 years ago |
|
varun
|
0379b3fe59
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
cd3a547fe2
|
made changes in tanks start and stop
|
3 years ago |
|
bhaskar
|
d30bdaec58
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
a367e03eca
|
startting price added in supplier
|
3 years ago |
|
varun
|
c9f70cecf9
|
made changes in tanks start and stop
|
3 years ago |
|
varun
|
9c45c3c511
|
made changes in tanks start and stop
|
3 years ago |
|
varun
|
b2a434ea26
|
made changes in tanks start and stop
|
3 years ago |
|
varun
|
964e8f7aaf
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
6e507ff35d
|
made changes in tanks start and stop
|
3 years ago |
|
bhaskar
|
6aa2b025f6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
18c30d28cd
|
picture
|
3 years ago |
|
varun
|
bfc2a0f10b
|
made changes in tanks start and stop
|
3 years ago |
|
varun
|
b8075479b8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
375cd5f387
|
made changes in tanks controller,added feets as measuring units in capacity calculation and decreased water consumption speed
|
3 years ago |
|
Bhaskara Kishore
|
5f085e2946
|
deliveryboy address added in all order pending
|
3 years ago |
|
Bhaskara Kishore
|
ac102c1c6c
|
using multer
|
3 years ago |
|
Bhaskara Kishore
|
6dc54f0571
|
profilepicture format jpeg jpg png
|
3 years ago |
|
Bhaskara Kishore
|
480688e611
|
deliveryboy latitude and longitude
|
3 years ago |
|
Bhaskara Kishore
|
a2beb9ae71
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
834e68e2fb
|
add filed profilepicture in get all suppliers
|
3 years ago |
|
varun
|
ed9f4aa4c6
|
made changes in tanks controller
|
3 years ago |
|
varun
|
68036ab6d6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
02ccd47588
|
made changes in tanks controller
|
3 years ago |
|
Bhaskara Kishore
|
fdc8e77ab5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
fab3660b48
|
cancel order particular customer
|
3 years ago |
|
varun
|
27d8faeabf
|
made changes in distrubance amount
|
3 years ago |
|
Bhaskara Kishore
|
3a08130982
|
deliveredDate changes
|
3 years ago |
|
Bhaskara Kishore
|
4b30dc40ee
|
date format change in delivered date
|
3 years ago |
|
Bhaskara Kishore
|
18c2d3f220
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
3719f32588
|
changes
|
3 years ago |
|
varun
|
8a94b95074
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
7b3bf36ed9
|
made changes in tanks controller
|
3 years ago |
|
Bhaskara Kishore
|
f890d25cf9
|
profilepicture file format
|
3 years ago |
|
Bhaskara Kishore
|
2284eacec1
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
0a9d15ccc1
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
2eb264433e
|
supplier profilePicture
|
3 years ago |
|
Bhaskara Kishore
|
95ac32d682
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
259a3640dd
|
changes
|
3 years ago |
|
varun
|
944647b2e0
|
made changes in tanks controller
|
3 years ago |
|
varun
|
9a5e5291c4
|
made changes in tanks controller
|
3 years ago |
|
varun
|
d03c8cdd89
|
made changes in tanks controller
|
3 years ago |
|
varun
|
b56117037a
|
made changes in tanks controller
|
3 years ago |
|
varun
|
496adc2445
|
made changes in tanks controller
|
3 years ago |
|
varun
|
f25cdae8e5
|
made changes in tanks controller
|
3 years ago |
|
varun
|
b76437b5d7
|
made changes in tanks controller
|
3 years ago |
|
varun
|
c808196bb0
|
made changes in tanks controller
|
3 years ago |
|
varun
|
f835314efa
|
made changes in tanks controller
|
3 years ago |
|
Bhaskara Kishore
|
85d1042584
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
dee9f714e9
|
tank levels
|
3 years ago |
|
varun
|
a7a6fc7868
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
3c7af3c14a
|
made changes in tanks controller
|
3 years ago |
|
Bhaskara Kishore
|
50f22797d8
|
calculate the sum of type of water level
|
3 years ago |
|
Bhaskara Kishore
|
0c775a5de1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
a1aecd71c5
|
cancle order
|
3 years ago |
|
varun
|
d34866554c
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
9789b3a265
|
made changes in tanker
|
3 years ago |
|
Bhaskara Kishore
|
5dcc261c20
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
f9c2bf86a6
|
deliveredDate field added
|
3 years ago |
|
varun
|
00bee542bf
|
made changes in tankerbooking latitude and longitude are removed
|
3 years ago |
|
Bhaskara Kishore
|
64741326e5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
d7bfdf697d
|
supplier status
|
3 years ago |
|
varun
|
0d6dcc8dce
|
created delivery tracking sms, created accounts for user and particular supplier
|
3 years ago |
|
varun
|
0456cf6a21
|
created delivery tracking sms, created accounts for user and particular supplier
|
3 years ago |
|
Bhaskara Kishore
|
dc5a34bbbb
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
f18d21d0ad
|
expectedDateOfOrder and description fields are added
|
3 years ago |
|
varun
|
9f02fde5c8
|
written user and supplier accounts basing on distrubance amount
|
3 years ago |
|
Bhaskara Kishore
|
7da21af9c8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
0ab2787f4d
|
Iot integration waterlevel update and sum of waterlevel
|
3 years ago |
|
varun
|
c5f5824ab2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
1ae52c4723
|
made changes in tanks
|
3 years ago |
|
Bhaskara Kishore
|
79622d4f22
|
order - delivered,cancel,pending apis
|
3 years ago |
|
Bhaskara Kishore
|
ba7006a2b3
|
fcmId added
|
3 years ago |
|
varun
|
3f8db59d33
|
made changes in supplier routes
|
3 years ago |
|
varun
|
9dabeb5f4e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
c7639331b4
|
This is for integrating hardwareId with tank along with hardwareId type and company
|
3 years ago |
|
Bhaskara Kishore
|
47126f2965
|
admin email validation and tankerbooking some changes
|
3 years ago |
|
varun
|
76b3bf9836
|
added tanker accounts
|
3 years ago |
|
Bhaskara Kishore
|
340def478f
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
342e5708d6
|
timezone added in friendrequest
|
3 years ago |
|
Bhaskara Kishore
|
b0b2e7beac
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
131ae5821e
|
CHANGES
|
3 years ago |
|
varun
|
84f8d33577
|
added fields
|
3 years ago |
|
varun
|
86a13b6573
|
made changes in amount update by delivery boy
|
3 years ago |
|
Bhaskara Kishore
|
30c433b055
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
1e801ea0d8
|
changes
|
3 years ago |
|
varun
|
580f6de383
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
dc4adae025
|
changes in update amount by delivery boy
|
3 years ago |
|
Bhaskara Kishore
|
3f7f36d566
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
31e6ec9c34
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
2f5c182b90
|
change
|
3 years ago |
|
varun
|
f38990e6ab
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
9a9c1c095a
|
added tanker running status to booking table
|
3 years ago |
|
Bhaskara Kishore
|
aa2412e92f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
fcb2000e94
|
resetpassword for user and supplier
|
3 years ago |
|
varun
|
a428e80afd
|
added tanker running status to booking table
|
3 years ago |
|
Bhaskara Kishore
|
3960daade2
|
sent again friend request
|
3 years ago |
|
Bhaskara Kishore
|
af472bb9f6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
4d7b8772f4
|
forgotpassword for user and supplier
|
3 years ago |
|
varun
|
4b1cdbe8c4
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
940d57c5c0
|
made changes in tankerbooking
|
3 years ago |
|
Bhaskara Kishore
|
757a11b5ab
|
CHANGES
|
3 years ago |
|
Bhaskara Kishore
|
96d4378bc9
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
16aacc6721
|
changes
|
3 years ago |
|
varun
|
287cd5a9f9
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
952b98dbe1
|
api to attach hardwareId to tank,changes in delete tanks
|
3 years ago |
|
Bhaskara Kishore
|
2a3c55810e
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
e49f1260e4
|
changes
|
3 years ago |
|
varun
|
63273d6dca
|
this is to check all iots
|
3 years ago |
|
varun
|
0be274c3ce
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
3c4a636e65
|
api calculate the time gap between the sensor data
|
3 years ago |
|
Bhaskara Kishore
|
28e0f50599
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
bcd24cb9ba
|
admin signin and signup
|
3 years ago |
|
varun
|
02c1276966
|
storing latest 3 iot data entries and deleting remaining
|
3 years ago |
|
varun
|
ec7bce1c93
|
storing latest 3 iot data entries and deleting remaining
|
3 years ago |
|
Bhaskara Kishore
|
e3d4402364
|
supplier and customer time stamp
|
3 years ago |
|
Bhaskara Kishore
|
4fc7443fa1
|
add timestmap and hardwareId
|
3 years ago |
|
varun
|
b52fc1067b
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
0658d2892d
|
added customer mobile,customer name,supplier name and mobile number
|
3 years ago |
|
Bhaskara Kishore
|
b68ff89a82
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
0c65d3b9e4
|
issue
|
3 years ago |
|
Bhaskara Kishore
|
887b2cefc6
|
deliveryboy login verify
|
3 years ago |
|
Bhaskara Kishore
|
7ac5fa68fa
|
deliveryboyphone verifcation
|
3 years ago |
|
Bhaskara Kishore
|
4f09762cd3
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
12dd58ac0d
|
timestamp
|
3 years ago |
|
varun
|
894de3b911
|
accounts of supplier
|
3 years ago |
|
varun
|
15389802d8
|
accounts of user
|
3 years ago |
|
Bhaskara Kishore
|
ba972d0135
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
9b5c35b8e2
|
timestamp added in pending supplier and customer
|
3 years ago |
|
varun
|
42612bb437
|
tank name uniquenesst,added payment system to delivery boy
|
3 years ago |
|
Bhaskara Kishore
|
b9de78e368
|
pass the timestamp in friend request api
|
3 years ago |
|
Bhaskara Kishore
|
0bcb16613f
|
pending and reject apis supplier and customer
|
3 years ago |
|
varun
|
18ac80e0a7
|
added capacity calculator
|
3 years ago |
|
varun
|
fef12c9389
|
added capacity calculator
|
3 years ago |
|
Bhaskara Kishore
|
79839e8c7e
|
longitude and latitude added user
|
3 years ago |
|
Bhaskara Kishore
|
cc36b04435
|
add field suppliername in deliveryboy side
|
3 years ago |
|
Bhaskara Kishore
|
002367524f
|
added longitude and latitude in user side
|
3 years ago |
|
Bhaskara Kishore
|
3bcc274e51
|
delivery boy login and phone verify
|
3 years ago |
|
Bhaskara Kishore
|
2881cf88c6
|
create a IOT device post and get apis
|
3 years ago |
|
varun
|
0e0398d5c8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
d11e05d1a8
|
delivery boy start and stop
|
3 years ago |
|
Bhaskara Kishore
|
2b4f383b6a
|
changes friend-request
|
3 years ago |
|
Bhaskara Kishore
|
2b8d6902b7
|
friendrequest accept and reject particual customer
|
3 years ago |
|
Bhaskara Kishore
|
7eb2d40b86
|
DELETE api for bookingid
|
3 years ago |
|
varun
|
88babe0d4c
|
apis to get all delivery boys and active delivery boys under supplier
|
3 years ago |
|
varun
|
c11917f8ce
|
made changes in supplier and delivery
|
3 years ago |
|
varun
|
fe6e6825ac
|
made changes in supplier and delivery
|
3 years ago |
|
varun
|
a712ecb43b
|
made changes in supplier and delivery
|
3 years ago |
|
varun
|
60bf11771a
|
created bookings of supplier and delivery boys
|
3 years ago |
|
varun
|
e7544901a4
|
created bookings of supplier and delivery boys
|
3 years ago |
|
Bhaskara Kishore
|
43c14a804d
|
tanker order accepted and rejected
|
3 years ago |
|
Bhaskara Kishore
|
f01063df28
|
get all tanker booking data
|
3 years ago |
|
Bhaskara Kishore
|
7dda54bf69
|
adding summary
|
3 years ago |
|
Bhaskara Kishore
|
78bfa5afcc
|
connected customers
|
3 years ago |
|
Bhaskara Kishore
|
7ebe3e0963
|
price filed added in tanker storing booking
|
3 years ago |
|
Bhaskara Kishore
|
dda1cc78de
|
get all pending customer from friend-request
|
3 years ago |
|
Bhaskara Kishore
|
06342b492f
|
get all tanker booking details
|
3 years ago |
|
Bhaskara Kishore
|
0d2f022d9e
|
delete and update delivery boy details
|
3 years ago |
|
Bhaskara Kishore
|
642b4fa267
|
delivery boy phone verification
|
3 years ago |
|
Bhaskara Kishore
|
c78755ae4b
|
deliveryboy login
|
3 years ago |
|
varun
|
1ec8d8b6fa
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
45cb3ecf8a
|
pending/rejected connection
|
3 years ago |
|
Bhaskara Kishore
|
b318765013
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
2f1b03c086
|
update tanker schema changes
|
3 years ago |
|
varun
|
cb9fb519ea
|
getting connected suppliers
|
3 years ago |
|
varun
|
e3490c5424
|
once the connect request is sent it will not show in connection request
|
3 years ago |
|
varun
|
062ddaed4a
|
changes in getting active delivery boys
|
3 years ago |
|
varun
|
5ee7cc0910
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
e71b3d7eba
|
changes in getting active delivery boys
|
3 years ago |
|
Bhaskara Kishore
|
97994a556f
|
connection-request issue
|
3 years ago |
|
Bhaskara Kishore
|
94af513b6e
|
latitude and longitude
|
3 years ago |
|
Bhaskara Kishore
|
21b384c6ac
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
886e13b122
|
update current supplier
|
3 years ago |
|
varun
|
2383d245d2
|
connect status checking
|
3 years ago |
|
varun
|
cb1c4a1bcc
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
74f38478c3
|
test
|
3 years ago |
|
Bhaskara Kishore
|
a3c123ca59
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
e7cdd263ce
|
friend-request
|
3 years ago |
|
varun
|
305288679f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
1c9fc20e5f
|
made changes for sending otp to supplier
|
3 years ago |
|
Bhaskara Kishore
|
1e161f8453
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
616b883824
|
price convert to array
|
3 years ago |
|
varun
|
1b0fc4072c
|
made changes for sending otp to supplier
|
3 years ago |
|
varun
|
abee47ecd4
|
made changes for sending otp to supplier
|
3 years ago |
|
varun
|
5777768c62
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
68a6786a2e
|
fetching active delivery boys for a particular supplier
|
3 years ago |
|
varun
|
ab270bcc91
|
fetching active delivery boys for a particular supplier
|
3 years ago |
|
raj
|
7725eaec7e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
raj
|
54a2decdfd
|
changes updated controllers models routes
|
3 years ago |
|
Bhaskara Kishore
|
bac957e25f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
f9ce6aa9be
|
connection-status
|
3 years ago |
|
raj
|
3bd6b0e953
|
updating tankers
|
3 years ago |
|
Bhaskara Kishore
|
fb2da04f9a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
e26b2fee31
|
connected status list
|
3 years ago |
|
raj
|
5c28bf1784
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
raj
|
5c2261c239
|
Commit message
|
3 years ago |
|
varun
|
0f11d82f36
|
mobile number verification
|
3 years ago |
|
varun
|
f49d0f0ed3
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
17b0b38719
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
a12804ef33
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
19f847be0c
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
af0f91a51d
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
81296fd723
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
b06f001dbc
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
Bhaskara Kishore
|
33a6689dad
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
bdde35206a
|
create a api status connected to display list
|
3 years ago |
|
varun
|
06c9fd2006
|
changes in tanker
|
3 years ago |
|
varun
|
e30e79327c
|
changes in add tanker
|
3 years ago |
|
Bhaskara Kishore
|
c66f1fcba6
|
In tankerschema side add price and changes
|
3 years ago |
|
Bhaskara Kishore
|
8d57fc40ef
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
c8c50556a2
|
supplier- user connection
|
3 years ago |
|
varun
|
f3cf84a119
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
a1d5b7f7fc
|
created delivery boys
|
3 years ago |
|
Bhaskara Kishore
|
542b9203cf
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
b387e6ad12
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
65cafdc44d
|
office_address null issue fix
|
3 years ago |
|
Bhaskara Kishore
|
5756a15196
|
office_address null issue fix
|
3 years ago |
|
varun
|
7ec394bc98
|
made changes in tanker
|
3 years ago |
|
varun
|
94a979fc53
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
df639eb0b8
|
made changes in tanker
|
3 years ago |
|
Bhaskara Kishore
|
3215745a50
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
3e190a2e50
|
All Supplier, Current Supplier, GetSingle Supplier
|
3 years ago |
|
varun
|
3895bc7161
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
0814cfffd0
|
start and stop
|
3 years ago |
|
Bhaskara Kishore
|
ab55b64cb2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
0e3b79525d
|
user and supplier friend-request accept and reject
|
3 years ago |
|
varun
|
2c969dc1be
|
start and stop -main changes
|
3 years ago |
|
varun
|
54b50ad8e4
|
start and stop -main
|
3 years ago |
|
varun
|
ff9a79b5d8
|
start and stop
|
3 years ago |
|
varun
|
25369ffb7d
|
start and stop
|
3 years ago |
|
varun
|
2c5dd9f475
|
start and stop
|
3 years ago |
|
varun
|
dc65e33af5
|
start and stop
|
3 years ago |
|
varun
|
203ea714ce
|
start and stop
|
3 years ago |
|
varun
|
c8768e3db6
|
start and stop
|
3 years ago |
|
varun
|
2e5bc65d63
|
start and stop
|
3 years ago |
|
varun
|
e60f9a018e
|
profile picture
|
3 years ago |
|
varun
|
8572101083
|
checking start and stop
|
3 years ago |
|
varun
|
f5edc7c60d
|
initial update removed in updating tank levels
|
3 years ago |
|
varun
|
3292af9179
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
59a3325ec5
|
made changes in profile picture and created get all tanker data
|
3 years ago |
|
Bhaskara Kishore
|
fc6cf869cc
|
supplierId changes
|
3 years ago |
|
varun
|
144587e196
|
made changes
|
3 years ago |
|
varun
|
3fcc7a91b1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
9a4974a006
|
made changes
|
3 years ago |
|
varun
|
10c3320e4b
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
5eb6223911
|
make changes in start and stop
|
3 years ago |
|
varun
|
1c205f7630
|
made changes in tank levels,start and stop
|
3 years ago |
|
varun
|
636d286763
|
made changes in tank levels,start and stop
|
3 years ago |
|
varun
|
099ac09a87
|
made changes in tank levels,start and stop
|
3 years ago |
|
varun
|
e65b2b757f
|
made changes in tank levels,start and stop
|
3 years ago |
|
Bhaskara Kishore
|
4844be2e7c
|
supplier phone verifyApi
|
3 years ago |
|
Bhaskara Kishore
|
a0a2114a36
|
error
|
3 years ago |
|
Bhaskara Kishore
|
c945240adf
|
module_err
|
3 years ago |
|
Bhaskara Kishore
|
df3f1f1637
|
module_error
|
3 years ago |
|
Bhaskara Kishore
|
1b0e23a806
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
d5e9daabe7
|
supplier schema signup and signin
|
3 years ago |
|
varun
|
bc0776b99d
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
Bhaskara Kishore
|
243df39ab1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
commit
|
3 years ago |
|
Bhaskara Kishore
|
0742bc6469
|
Supplier Schema and signup,signin
|
3 years ago |
|
varun
|
caf6686afb
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
ef291f20e7
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
d88bb6578a
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
68f92cee98
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
79b11363e6
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
aeba3d8af5
|
changes in tanks and start and stop
|
3 years ago |
|
Bhaskara Kishore
|
2321ea6077
|
logout
|
3 years ago |
|
Bhaskara Kishore
|
955b5936d4
|
logout functionality
|
3 years ago |
|
varun
|
7f06730530
|
changes in motor status
|
3 years ago |
|
varun
|
9db0671b49
|
made changes in customer id and changed tank location to lower case while creating them
|
3 years ago |
|
varun
|
4d22f4605b
|
motor on and off status functionality
|
3 years ago |
|
varun
|
3b6f227fbf
|
madce changes in create connections
|
3 years ago |
|
varun
|
a1be104b61
|
created schema for start and stop in tanks.js and made changes start and stop to store data
|
3 years ago |
|
varun
|
b6286cf82c
|
made changes in create connections and tanks controllers regarding start and stop
|
3 years ago |
|
varun
|
6af9949a28
|
removed percentages growth and decrease system in start and stop,update tank levels, created desired tank level system,and written bore to overhead
|
3 years ago |
|
varun
|
e980d26523
|
created delete connections
|
3 years ago |
|
varun
|
89c27bbfd8
|
created delete connections
|
3 years ago |
|
varun
|
ec04441bb2
|
created delete connections
|
3 years ago |
|
varun
|
85c3f75ede
|
made changes in start and stop,created consumption
|
3 years ago |
|
varun
|
2a279e3ce4
|
made changes in start and stop,created consumption
|
3 years ago |
|
varun
|
d381d95533
|
made changes in start and stop,created consumption
|
3 years ago |
|
varun
|
daaf44494d
|
creating start and stop,made changes in update tank levels
|
3 years ago |
|
varun
|
d3efa93238
|
creating start and stop
|
3 years ago |
|
varun
|
c4202f29d1
|
made changes in tanks.js
|
3 years ago |
|
varun
|
5b52b7c660
|
made changes in tanks controller
|
3 years ago |
|
varun
|
8702c293c7
|
made changes in tanks controller
|
3 years ago |
|
varun
|
d7be8badb0
|
made changes in tanks controller
|
3 years ago |
|
varun
|
af6892f8b1
|
made changes in tanks controller
|
3 years ago |
|
varun
|
2b871d1114
|
made changes in tanks controller
|
3 years ago |
|
varun
|
ce802ed7bd
|
made changes in tanks controller
|
3 years ago |
|
varun
|
27bd372904
|
made changes in tanks controller
|
3 years ago |
|
varun
|
d18ec3f03b
|
made changes in tanker
|
3 years ago |
|
varun
|
dfb2c0710c
|
made changes in tanker
|
3 years ago |
|
varun
|
74df460ec4
|
made changes in tanker
|
3 years ago |
|
varun
|
a0fd1f1f0d
|
made changes in tanker
|
3 years ago |
|
varun
|
0753b7cd03
|
made changes in tanker
|
3 years ago |
|
varun
|
ca16d9f4e6
|
made changes in create connections
|
3 years ago |
|
varun
|
6b9f68297e
|
token expiry changed to 30d
|
3 years ago |
|
varun
|
0b7d7dfd9d
|
token expiry changed to 30000
|
3 years ago |
|
varun
|
98d977b063
|
token expiry changed 15d
|
3 years ago |
|
varun
|
8df7e44626
|
token expiry changed 30100MS
|
3 years ago |
|
varun
|
7ef67bfb0a
|
token expiry changed 301
|
3 years ago |
|
varun
|
204e3df465
|
changed token expiry to 300 seconds for test
|
3 years ago |
|
varun
|
5263286763
|
changed token expiry to 300 seconds for test
|
3 years ago |
|
varun
|
db8b059fd0
|
changed token expiry to 60 seconds for test
|
3 years ago |
|
varun
|
5740713b68
|
added date and time for tanker booking
|
3 years ago |
|
varun
|
a8dc441425
|
added date and time for tanker booking
|
3 years ago |
|
varun
|
471944b3e5
|
made update tank levels api hit automatically when get tank levels called
|
3 years ago |
|
varun
|
6d1dc5611d
|
made update tank levels api hit automatically when get tank levels called
|
3 years ago |
|
varun
|
0446f665c8
|
made changes in tanker controller
|
3 years ago |
|
varun
|
9b2ceca8d8
|
made changes in tanker controller
|
3 years ago |
|
varun
|
c8b54ee6cf
|
made changes in tanker controller
|
3 years ago |
|
varun
|
bbd3db023e
|
made changes in tank creation
|
3 years ago |
|
varun
|
1c03ff6f25
|
creating sms and logout api
|
3 years ago |
|
varun
|
706b914fad
|
made chanbges in tanks controllers in update water level
|
3 years ago |
