0.5.4

marelab · Mar 9, 2018 · ec1e744 · ec1e744
1 parent cd6b900
commit ec1e744
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,21 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+
+## [0.5.4] - 2018-03-09
 #### Added
 - [webui] colorize event logs based on severity.
+- [webui] progress bar on saving settings.
 - [dev tools] event log for websocket emulator
 
 #### Fixed
 - [firmware] Fix #75 Scan of wifi returns more columns of the same wifi.
 - [webui] Fix #74 #33 completely New user with incorrect validity.
 - [webui] New user with incorrect date.
+- [webui] Editing user results non parsed values.
+
+#### Changed
+- [webui] event table breakpoints.
 
 ## [0.5.3] - 2018-03-08
 #### Added

diff --git a/bin/firmware.bin b/bin/firmware.bin
diff --git a/src/webh/esprfid.htm.gz.h b/src/webh/esprfid.htm.gz.h
diff --git a/src/webh/esprfid.js.gz.h b/src/webh/esprfid.js.gz.h
diff --git a/src/webh/index.html.gz.h b/src/webh/index.html.gz.h
diff --git a/src/websrc/esprfid.htm b/src/websrc/esprfid.htm
@@ -48,25 +48,23 @@ <h4 class="modal-title">Please wait while restoring user data...</h4>
  <br>
  <br>
  <div class="container">
-  <div class="row">
+ <div class="row">
  <br>
  <div class="col-md-4 col-md-offset-4">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">Please wait while your ESP restarts...</h3>
- </div>
- <div class="panel-body">
-<div class="progress">
- <div id="updateprog" class="progress-bar progress-bar-striped active" role="progressbar"
- aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0%">
- 0%
- </div>
-</div>
- </div>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Please wait while your ESP restarts...</h3>
+ </div>
+ <div class="panel-body">
+ <div class="progress">
+ <div id="updateprog" class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0%">0%
+ </div>
+ </div>
+ </div>
+ </div>
  </div>
-  </div>
-  </div>
+ </div>
+ </div>
 </div>
 <div id="generalcontent">
  <br>

diff --git a/src/websrc/index.html b/src/websrc/index.html
@@ -121,7 +121,7 @@ <h4 class="modal-title">Please review changes</h4>
  <h4 class="modal-title">Are you absolutely sure?</h4>
  </div>
  <div class="alert alert-warning">
- <h4><strong>Warning!</strong> Unexpected bad things will happen if you don’t read this!</h4>
+ <h5><strong>Warning!</strong> Unexpected bad things will happen if you don’t read this!</h5>
  </div>
  <div class="modal-body">
  <h5>

diff --git a/src/websrc/js/esprfid.js b/src/websrc/js/esprfid.js
@@ -28,7 +28,7 @@ var config = {
  "hostnm": "esp-rfid",
  "restart": "0",
  "pswd": "admin",
- "version": "v0.5.3"
+ "version": "v0.5.4"
  },
  "mqtt": {
  "enabled": "0",
@@ -53,6 +53,7 @@ var slot = 0;
 var completed = false;
 var file = {};
 var backupstarted = false;
+var restorestarted = false;
 
 
 
@@ -187,7 +188,7 @@ function revcommit() {
 
 function commit() {
  websock.send(JSON.stringify(config));
- location.reload();
+ inProgress();
 }
 
 function uncommited() {
@@ -447,6 +448,7 @@ function restore1by1(i, len, data) {
  document.getElementById("dynamic").className = "progress-bar progress-bar-success";
  document.getElementById("dynamic").innerHTML = "Completed";
  document.getElementById("dynamic").style.width = "100%";
+ restorestarted = false;
  completed = true;
  document.getElementById("restoreclose").style.display = "block";
  }
@@ -472,6 +474,7 @@ function restoreUser() {
  if (x) {
  recordstorestore = json.list.length;
  data = json.list;
+ restorestarted = true;
  $("#restoremodal").modal({ backdrop: "static", keyboard: false });
  restore1by1(slot, recordstorestore, data);
  }
@@ -491,27 +494,25 @@ function initEventTable() {
  newlist[i].value = {};
  newlist[i].value = dup;
  var c = dup.type;
- switch(c) {
+ switch (c) {
  case "WARN":
- newlist[i].options.classes = "warning";
- break;
+  newlist[i].options.classes = "warning";
+  break;
  case "INFO":
- newlist[i].options.classes = "info";
- break;
+  newlist[i].options.classes = "info";
+  break;
  case "ERRO":
- newlist[i].options.classes = "danger";
- break;
+  newlist[i].options.classes = "danger";
+  break;
  default:
- break;
- } 
- 
+  break;
+ }
+
  }
- console.log(newlist);
  $("#dismiss").click();
  jQuery(function($) {
  FooTable.init("#eventtable", {
- columns: [
- {
+ columns: [{
  "name": "type",
  "title": "Event Type",
  "type": "text"
@@ -522,8 +523,7 @@ function initEventTable() {
  },
  {
  "name": "desc",
- "title": "Description",
- "breakpoints": "xs sm"
+ "title": "Description"
  },
  {
  "name": "data",
@@ -544,7 +544,8 @@ function initEventTable() {
  return formatted;
  },
  "sorted": true,
- "direction": "DESC"
+ "direction": "DESC",
+ "breakpoints": "xs sm"
  }
  ],
  rows: newlist
@@ -633,8 +634,7 @@ function initUserTable() {
  "parser": function(value) {
  if (value === 1) {
  return "Active";
- } 
- else if (value === 99) {
+ } else if (value === 99) {
  return "Admin";
  } else if (value === 0) {
  return "Disabled";
@@ -708,7 +708,9 @@ function initUserTable() {
  validuntil: (new Date($editor.find("#validuntil").val()).getTime() / 1000)
  };
  if (row instanceof FooTable.Row) {
- row.val(values);
+ row.delete();
+ values.id = uid++;
+ ft.rows.add(values);
  } else {
  values.id = uid++;
  ft.rows.add(values);
@@ -874,8 +876,10 @@ function socketMessageListener(evt) {
  }
  break;
  case "userfile":
- if (!completed && obj.result === true) {
- restore1by1(slot, recordstorestore, data);
+ if (restorestarted) {
+ if (!completed && obj.result === true) {
+ restore1by1(slot, recordstorestore, data);
+ }
  }
  break;