mirror of https://github.com/D4-project/d4-core
chg: [registered sensor] remove registered sensors
parent
0bd02f21d6
commit
d870819080
|
@ -148,3 +148,17 @@ def delete_pending_sensor(req_dict):
|
||||||
def _delete_pending_sensor(sensor_uuid):
|
def _delete_pending_sensor(sensor_uuid):
|
||||||
r_serv_db.srem('sensor_pending_registration', sensor_uuid)
|
r_serv_db.srem('sensor_pending_registration', sensor_uuid)
|
||||||
return ({'uuid': sensor_uuid}, 200)
|
return ({'uuid': sensor_uuid}, 200)
|
||||||
|
|
||||||
|
def delete_registered_sensor(req_dict):
|
||||||
|
sensor_uuid = req_dict.get('uuid', None)
|
||||||
|
if not is_valid_uuid_v4(sensor_uuid):
|
||||||
|
return ({"status": "error", "reason": "Invalid uuid"}, 400)
|
||||||
|
sensor_uuid = sensor_uuid.replace('-', '')
|
||||||
|
# sensor not registred
|
||||||
|
if not r_serv_db.sismember('registered_uuid', sensor_uuid):
|
||||||
|
return ({"status": "error", "reason": "Sensor not registered"}, 404)
|
||||||
|
return _delete_registered_sensor(sensor_uuid)
|
||||||
|
|
||||||
|
def _delete_registered_sensor(sensor_uuid):
|
||||||
|
r_serv_db.srem('registered_uuid', sensor_uuid)
|
||||||
|
return ({'uuid': sensor_uuid}, 200)
|
||||||
|
|
|
@ -762,6 +762,17 @@ def delete_pending_sensor():
|
||||||
else:
|
else:
|
||||||
return jsonify(res[0])
|
return jsonify(res[0])
|
||||||
|
|
||||||
|
@app.route('/server/delete_registered_sensor')
|
||||||
|
@login_required
|
||||||
|
@login_admin
|
||||||
|
def delete_registered_sensor():
|
||||||
|
uuid_sensor = request.args.get('uuid')
|
||||||
|
res = Sensor.delete_registered_sensor({'uuid': uuid_sensor})
|
||||||
|
if res[1] == 200:
|
||||||
|
return redirect(url_for('registered_sensor'))
|
||||||
|
else:
|
||||||
|
return jsonify(res[0])
|
||||||
|
|
||||||
@app.route('/uuid_change_stream_max_size')
|
@app.route('/uuid_change_stream_max_size')
|
||||||
@login_required
|
@login_required
|
||||||
@login_user_basic
|
@login_user_basic
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
<th class="bg-info text-white">last seen</th>
|
<th class="bg-info text-white">last seen</th>
|
||||||
<th class="bg-info text-white">types</th>
|
<th class="bg-info text-white">types</th>
|
||||||
<th class="bg-secondary text-white">Status</th>
|
<th class="bg-secondary text-white">Status</th>
|
||||||
|
<th class="bg-secondary text-white"></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -85,6 +86,11 @@
|
||||||
<i class="fa fa-check-circle"></i> Connected
|
<i class="fa fa-check-circle"></i> Connected
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="{{ url_for('delete_registered_sensor') }}?uuid={{row_uuid['uuid']}}">
|
||||||
|
<button type="button" class="btn btn-outline-danger"><i class="fa fa-trash"></i></button>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
Loading…
Reference in New Issue