Merge pull request #18 from CreatorDev/dev

merge dev to master

Author: mar3kk

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 # Paths
 ########
+include_directories(${STAGING_DIR} ${STAGING_DIR}/usr/include/glib-2.0)
 ADD_SUBDIRECTORY(luci-mod-provisioning)
 ADD_SUBDIRECTORY(provisioning-daemon)
 ADD_SUBDIRECTORY(usr)
+

luci-mod-provisioning/luasrc/controller/creator/provisioning.lua

@@ -17,6 +17,7 @@ function index()
     entry({"admin", "creator", "provisioning", "start_daemon"}, call("start_daemon"), nil, nil).dependent=false
     entry({"admin", "creator", "provisioning", "stop_daemon"}, call("stop_daemon"), nil, nil).dependent=false
     entry({"admin", "creator", "provisioning", "start_stop_daemon"}, call("start_stop_daemon"), nil, nil).dependent=false
+    entry({"admin", "creator", "provisioning", "change_clicker_name"}, call("change_clicker_name"), nil, nil).dependent=false
 end
 
 
@@ -52,7 +53,7 @@ function start_provisioning()
         luci.http.status (404, "Invalid clickerID")
     end
 
-    local response = provisioning.startProvisioning()
+    local response = provisioning.startProvisioning(clickerID)
 
 end
 
@@ -90,5 +91,17 @@ function start_stop_daemon()
     else
         stop_daemon();
     end
+end
+
+function change_clicker_name()
 
+    local clickerID = tonumber(luci.http.formvalue("clickerID"))
+    local clickerName = luci.http.formvalue("clickerName")
+    
+    local status = conn:call("provisioning-daemon", "setClickerName", {clickerID = clickerID, clickerName = clickerName})
+    if (status == nil) then
+        luci.http.status(200, "Failed to change clicker name")
+    else
+        luci.http.status(200, "OK")
+    end
 end

luci-mod-provisioning/luasrc/view/creator_provisioning/clicker_list.htm

@@ -29,8 +29,14 @@
                 <img src="/luci-static/resources/creator/gfx/Clicker_connected.jpg" />
             </div>
             <div class="col-lg-5" style="height:50px;">
-                <p class="provision-clicker-name"><%= clicker["name"] %></p>
+                <p class="provision-clicker-name">
+                    <%= clicker["name"] %>
+                    <a style="margin-left:10px; margin-top:-5px;" href="#" onclick="changeClickerName(<%= clicker["id"]%>, '<%= clicker["name"]%>');">
+                        <img src="/luci-static/resources/creator/gfx/ic_mode_edit_black_24dp_1x.png" />
+                    </a>
+                </p>
             </div>
+
             <div class="col-lg-3 text-right" style="height:50px;">
                 <% if clicker["isError"] and not clicker["inProvisionState"] then %>
                     <p class="provision-error" style="color:red;">PROVISIONING FAILED </p>
@@ -49,12 +55,10 @@
                     <img src="/luci-static/resources/creator/gfx/ic-loading.svg" style="margin-top:13px;float:left;display:block;"/>
                     <p style="float:left;font-size:11px;">PROVISIONING</p>
                 </div>
-                <% elseif clicker["selected"] and not clicker["isError"] then %>
-                <a class="btn-creator provision-button" style="width:120px; margin:7px 0px 0px 0px !important;" onclick="startProvisioning(<%= clicker["id"]%>);return;">PROVISION</a>
-                <% elseif clicker["selected"] and clicker["isError"] then %>
+                <% elseif clicker["isError"] then %>
                 <a class="btn-creator provision-button" style="width:120px; margin:7px 0px 0px 0px !important;text-align:center;" onclick="startProvisioning(<%= clicker["id"]%>);return;">RETRY</a>
                 <% else %>
-                <a class="btn-creator provision-button disabled" style="width:120px; margin:7px 0px 0px 0px !important;">PROVISION</a>
+                <a class="btn-creator provision-button" style="width:120px; margin:7px 0px 0px 0px !important;" onclick="startProvisioning(<%= clicker["id"]%>);return;">PROVISION</a>
                 <% end %>
             </div>
         </div>
@@ -99,7 +103,7 @@
             <div class="col-lg-3 text-right" style="height:50px;">
                 <div style="float:right">
                     <img src="/luci-static/resources/creator/gfx/connected.svg" style="float:left;display:block;margin-top:13px;"/>
-                    <p class="connected" style="float:left;color:#299830;">CONNECTED</p>
+                    <p class="connected" style="float:left;color:#299830;">PROVISIONED</p>
                 </div>
             </div>
         </div>

luci-mod-provisioning/luasrc/view/creator_provisioning/provisioning.htm

@@ -60,8 +60,35 @@ <h4 class="modal-title">Modal title</h4>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
-</div>
 
+
+
+<div class="modal" tabindex="-1" role="dialog" id="clicker-name-modal">
+  <div class="modal-dialog modal-sm" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Enter new clicker name</h4>
+    </div>
+      <div class="modal-body">
+        <div class="row">
+            <div class="col-lg-12" id="clicker-name-modal-body">
+                <input type="text" class="form-control" id="clicker-name-modal-input"/>
+            </div>
+        </div>
+        <br />
+        <div class="row">
+            <div class="col-lg-12 text-right">
+                <button id="clicker-name-modal-save" type="button" class="btn btn-primary" data-dismiss="modal">Save</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
+            </div>
+        </div>
+
+      </div>
+
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+</div>
 <%+footer%>
 
 <script>
@@ -153,4 +180,31 @@ <h4 class="modal-title">Modal title</h4>
     });
 }
 
+function changeClickerName(id, name) {
+    showClickerNameModal(id, name);
+}
+
+function showClickerNameModal(id, name) {
+    $("#clicker-name-modal-input").val(name);
+    $("#clicker-name-modal-save").attr("onclick","saveClickerName(" + id + ", $('#clicker-name-modal-input').val());");
+    $("#clicker-name-modal").modal('show');
+}
+
+function hideClickerNameModal() {
+
+}
+
+function saveClickerName(id, name) {
+    $.post('provisioning/change_clicker_name', {clickerID : id, clickerName : name}, function(data) {
+
+    })
+    .fail(function(jqXHR, textStatus, errorThrown) {
+        hideClickerNameModal();
+        showModalError(errorThrown);
+    })
+    .done(function() {
+        hideClickerNameModal();
+    });
+}
+
 </script>

luci-mod-provisioning/resources/creator/gfx/ic_mode_edit_black_24dp_1x.png

@@ -1,11 +1,13 @@
 # Add executable targets
 ########################
-ADD_EXECUTABLE(provisioning_daemon_appd provisioning_daemon.c clicker.c led.c connection_manager.c processing_queue.c clicker_sm.c utils.c ubus_agent.c provision_history.c)
+file (GLOB src *.c*)
+ADD_EXECUTABLE(provisioning_daemon_appd ${src})
 # Add library targets
 #####################
 FIND_LIBRARY(LIB_LMC libletmecreate_core.so ${STAGING_DIR}/usr/lib)
 FIND_LIBRARY(LIB_CONFIG libconfig.so ${STAGING_DIR}/usr/lib)
-TARGET_LINK_LIBRARIES(provisioning_daemon_appd ${LIB_LMC} ${LIB_CONFIG} crypto ubus ubox json-c blobmsg_json)
+FIND_LIBRARY(LIB_GLIB libglib-2.0.so ${STAGING_DIR}/usr/lib)
+TARGET_LINK_LIBRARIES(provisioning_daemon_appd ${LIB_LMC} ${LIB_CONFIG} ${LIB_GLIB} crypto ubus ubox json-c blobmsg_json)
 
 # Add install targets
 ######################