 bhaskar
|
5c1fe0fe86
|
profile picture
|
3 years ago |
 varun
|
57f373493a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
ab1e4ab5fc
|
made changes in tankscontroller
|
3 years ago |
|
bhaskar
|
4420562f10
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
bhaskar
|
4596570b4f
|
type changes
|
3 years ago |
|
varun
|
f5e219edf5
|
added stop_at
|
3 years ago |
|
bhaskar
|
e0944efdb4
|
change
|
3 years ago |
|
bhaskar
|
2f2ce11202
|
change
|
3 years ago |
|
bhaskar
|
6ab3117307
|
changes create connection
|
3 years ago |
|
bhaskar
|
b4d7e90013
|
changes
|
3 years ago |
|
varun
|
9864359884
|
made medicine details
|
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 |
|
bhaskar
|
a367e03eca
|
startting price added in supplier
|
3 years ago |
|
bhaskar
|
18c30d28cd
|
picture
|
3 years ago |
|
Bhaskara Kishore
|
ac102c1c6c
|
using multer
|
3 years ago |
|
Bhaskara Kishore
|
fab3660b48
|
cancel order particular customer
|
3 years ago |
|
Bhaskara Kishore
|
3719f32588
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
f890d25cf9
|
profilepicture file format
|
3 years ago |
|
Bhaskara Kishore
|
0a9d15ccc1
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
2eb264433e
|
supplier profilePicture
|
3 years ago |
|
Bhaskara Kishore
|
50f22797d8
|
calculate the sum of type of water level
|
3 years ago |
|
Bhaskara Kishore
|
a1aecd71c5
|
cancle order
|
3 years ago |
|
Bhaskara Kishore
|
f9c2bf86a6
|
deliveredDate field added
|
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
|
0ab2787f4d
|
Iot integration waterlevel update and sum of waterlevel
|
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
|
fcb2000e94
|
resetpassword for user and supplier
|
3 years ago |
|
Bhaskara Kishore
|
4d7b8772f4
|
forgotpassword for user and supplier
|
3 years ago |
|
varun
|
952b98dbe1
|
api to attach hardwareId to tank,changes in delete tanks
|
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
|
bcd24cb9ba
|
admin signin and signup
|
3 years ago |
|
Bhaskara Kishore
|
4fc7443fa1
|
add timestmap and hardwareId
|
3 years ago |
|
Bhaskara Kishore
|
7ac5fa68fa
|
deliveryboyphone verifcation
|
3 years ago |
|
varun
|
894de3b911
|
accounts of supplier
|
3 years ago |
|
varun
|
15389802d8
|
accounts of user
|
3 years ago |
|
varun
|
42612bb437
|
tank name uniquenesst,added payment system to delivery boy
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
a1d5b7f7fc
|
created delivery boys
|
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
|
3e190a2e50
|
All Supplier, Current Supplier, GetSingle Supplier
|
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
|
59a3325ec5
|
made changes in profile picture and created get all tanker data
|
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 |
|
Bhaskara Kishore
|
4844be2e7c
|
supplier phone verifyApi
|
3 years ago |
|
Bhaskara Kishore
|
d5e9daabe7
|
supplier schema signup and signin
|
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
|
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
|
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
|
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
|
d3efa93238
|
creating start and stop
|
3 years ago |
|
varun
|
d7be8badb0
|
made changes in tanks controller
|
3 years ago |
|
varun
|
af6892f8b1
|
made changes in tanks controller
|
3 years ago |
|
varun
|
dfb2c0710c
|
made changes in tanker
|
3 years ago |
