 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
|
2 years ago |
|
varun
|
ee3a7784a1
|
made sump to sump start and stop
|
2 years ago |
|
bhaskar
|
9c5bbf73ce
|
CONNECTION changes
|
2 years ago |
|
bhaskar
|
fde99df018
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
ec6c88e407
|
change
|
2 years ago |
|
varun
|
ea98c921d4
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
0c275de032
|
made sump to sump start and stop
|
2 years ago |
|
bhaskar
|
dd902b1482
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
ace8733bfd
|
changes
|
2 years ago |
|
varun
|
214abaa4f5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
b7a69e0517
|
made sump to sump start and stop
|
2 years ago |
|
bhaskar
|
a0af834625
|
connection issue
|
2 years ago |
|
bhaskar
|
1602dbbf03
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
e0944efdb4
|
change
|
2 years ago |
|
bhaskar
|
2f2ce11202
|
change
|
2 years ago |
|
varun
|
d7ee584aeb
|
made sump to sump start and stop
|
2 years ago |
|
varun
|
59d8be500a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
56e4b322bf
|
made sump to sump start and stop
|
2 years ago |
 raj
|
16a6f4261b
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
raj
|
224c221e60
|
changes
|
2 years ago |
|
bhaskar
|
6ab3117307
|
changes create connection
|
2 years ago |
|
bhaskar
|
d2fdcfbcd8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
b4d7e90013
|
changes
|
2 years ago |
|
bhaskar
|
ac62f7fced
|
changes
|
2 years ago |
|
varun
|
78e4b3844f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
a941c7e5bc
|
test
|
2 years ago |
|
bhaskar
|
52376c0bee
|
test
|
2 years ago |
|
bhaskar
|
611b810cd8
|
test
|
2 years ago |
|
bhaskar
|
184d1d1007
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
d73a781c34
|
changes
|
2 years ago |
|
varun
|
9864359884
|
made medicine details
|
2 years ago |
|
varun
|
879c4d23d6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
0a0720f787
|
added sump to sump connection
|
2 years ago |
|
bhaskar
|
b5b90e80da
|
change
|
2 years ago |
|
bhaskar
|
e02d669fe0
|
inputconnection ismotor issue
|
2 years ago |
|
bhaskar
|
df3b1af3b7
|
ismotor added update connection
|
2 years ago |
|
bhaskar
|
17dfa970bf
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
aaa5e2c370
|
inputismotor and outputismotor feilds are added
|
2 years ago |
|
varun
|
2de9460631
|
made changes in distrubance amount
|
2 years ago |
|
varun
|
da98313cd9
|
made changes in tanks start and stop
|
2 years ago |
|
varun
|
0379b3fe59
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
cd3a547fe2
|
made changes in tanks start and stop
|
2 years ago |
|
bhaskar
|
d30bdaec58
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
a367e03eca
|
startting price added in supplier
|
2 years ago |
|
varun
|
c9f70cecf9
|
made changes in tanks start and stop
|
2 years ago |
|
varun
|
9c45c3c511
|
made changes in tanks start and stop
|
2 years ago |
|
varun
|
b2a434ea26
|
made changes in tanks start and stop
|
2 years ago |
|
varun
|
964e8f7aaf
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
6e507ff35d
|
made changes in tanks start and stop
|
2 years ago |
|
bhaskar
|
6aa2b025f6
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
bhaskar
|
18c30d28cd
|
picture
|
2 years ago |
|
varun
|
bfc2a0f10b
|
made changes in tanks start and stop
|
2 years ago |
|
varun
|
b8075479b8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
2 years ago |
|
varun
|
375cd5f387
|
made changes in tanks controller,added feets as measuring units in capacity calculation and decreased water consumption speed
|
2 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 |
