 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 |
