You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cmda.apache.org by xi...@apache.org on 2015/09/05 02:20:09 UTC
[05/50] [abbrv] incubator-cmda git commit: Remove sensor
http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a0c167b8/app/views/sensors.scala.html
----------------------------------------------------------------------
diff --git a/app/views/sensors.scala.html b/app/views/sensors.scala.html
deleted file mode 100644
index bae2e81..0000000
--- a/app/views/sensors.scala.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-@(sensors: List[metadata.Sensor], sensorForm: play.data.Form[metadata.Sensor])
-@import helper._
-
-@scripts = {
- <script src='@routes.Assets.at("javascripts/edit_button.js")'></script>
-}
-
-@main("Sensors",scripts) {
-
- @flash_message()
-
- <h1>@sensors.size() Sensors</h1>
- <table class="table table-striped table-bordered table-condensed">
- <tr>
- <td>Sensor Name</td>
- <td>Sensor Type</td>
- <td>Device URI</td>
- <td>Sensor Category</td>
- <td>User Defined Fields</td>
-
- @if(session.get("email")){
- <td>Operation</td>
- }
- </tr>
-
- @for(sensor <- sensors) {
- <tr>
- <td>@sensor.getSensorName()</td>
- <td>@sensor.getSensorTypeName()</td>
- <td>@sensor.getDeviceUri()</td>
- <td>@sensor.getSensorCategoryName()</td>
- <td>
- <span class="@sensor.getSensorName() editable"
- data-name='sensorUserDefinedFields'>
- @sensor.getSensorUserDefinedFields()
- </span>
- </td>
-
- @if(session.get("email")){
-
- <td class="operation">
- <input type="button" class="edit-btn btn btn-primary" value="Edit"
- data-pk='@sensor.getSensorName()'
- data-url='@routes.SensorController.editSensor()'
- >
-
- @form(routes.SensorController.deleteSensor()){
- <input name="idHolder" type="hidden" value="@sensor.getSensorName()">
- <input type="submit" class="btn btn-danger" value="Delete" onclick="return confirm('Are you sure you want to delete this item?')">
- }
-
- </td>
- }
- </tr>
- }
- </table>
-
-
- @if(session.get("email")){
- <h2>Add a new sensor</h2>
-
- @helper.form(action = routes.SensorController.newSensor) {
-
- @inputText(
- sensorForm("sensorName"),
- '_label -> "Sensor Name * (Please DO NOT contain spaces)",
- '_error -> sensorForm.globalError
- )
- @select(
- sensorForm("deviceUri"),
- options(metadata.Device.allDeviceUri()),
- '_label -> "Parent Device",
- '_error -> sensorForm.globalError
- )
- @select(
- sensorForm("sensorTypeName"),
- options(metadata.SensorType.allSensorTypeName()),
- '_label -> "Sensor Type (Please select the sensor types belonging to the parent device)",
- '_error -> sensorForm.globalError
- )
-
- @inputText(
- sensorForm("sensorUserDefinedFields"),
- '_label -> "User Defined Fields",
- '_error -> sensorForm.globalError
- )
-
-
- <div class="actions">
- <input type="submit" class="btn btn-primary" value="Create">
- <a href="@routes.Application.index" class="btn">Cancel</a>
- </div>
-
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a0c167b8/conf/routes
----------------------------------------------------------------------
diff --git a/conf/routes b/conf/routes
index 62c756a..5761ab6 100644
--- a/conf/routes
+++ b/conf/routes
@@ -35,40 +35,10 @@ POST /solve/report controllers.Bug
# Map static resources from the /public folder to the /assets URL path
GET /assets/*file controllers.Assets.at(path="/public", file)
-# devices
-GET /devices controllers.DeviceController.devices()
-POST /new/devices controllers.DeviceController.newDevice()
-POST /delete/devices controllers.DeviceController.deleteDevice()
-POST /edit/devices controllers.DeviceController.editDevice()
-
-# sensors
-GET /sensors controllers.SensorController.sensors()
-POST /new/sensors controllers.SensorController.newSensor()
-POST /delete/sensors controllers.SensorController.deleteSensor()
-POST /edit/sensors controllers.SensorController.editSensor()
-
-# sensor_categories
-GET /sensorCategories controllers.SensorCategoryController.sensorCategories()
-POST /new/sensorCategories controllers.SensorCategoryController.newSensorCategory()
-POST /delete/sensorCategories controllers.SensorCategoryController.deleteSensorCategory()
-POST /download/sensorCategories controllers.SensorCategoryController.downloadSensorCategory()
-POST /edit/sensorCategories controllers.SensorCategoryController.editSensorCategory()
-
-# dashboard
-GET /dashboard controllers.DashboardController.dashboard()
-
# About Us
GET /aboutus controllers.AboutusController.aboutus()
GET /aboutProject controllers.AboutusController.aboutProject()
-# sensor reading
-GET /sensorReading controllers.SensorReadingController.sensorReadings()
-POST /getSensorReadings controllers.SensorReadingController.getSensorReadingsWithinRange()
-POST /getSensorReadingsAtTimestamp controllers.SensorReadingController.getSensorReadingsAtTimestamp()
-POST /getLatestSensorReadings controllers.SensorReadingController.getLatestSensorReadings()
-
-
-
# Estimator recommendation
GET /estimator controllers.EstimateController.estimate(email ?= null, vfile ?= null, dataset ?= null)