add send command within device list TasmoAdmin#100

inverse · Jun 21, 2018 · 5279191 · 5279191
2 parents 0511747 + 060187e
commit 5279191
Show file tree

Hide file tree

Showing 12 changed files with 261 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,7 +27,7 @@
 ## v0.0.7
 - fixed /app/tasmoadmin/.docker to disable SelfUpdate
 - restyle show more
-
+- add send command within device list #100
 
 ## v0.0.6   
 ### 2018-05-23

diff --git a/tasmoadmin/lang/lang_de.ini b/tasmoadmin/lang/lang_de.ini
@@ -252,6 +252,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Bist du sicher?"
 DELETE_DEVICE_CONFIRM_TEXT = "Willst du wirklich das Modul \"%s\" ( %s ) entfernen?"
 ERROR = "Fehler"
 SHOW_MORE = "Detail Ansicht"
+BTN_COMMAND = "Befehl"
+CB_COMMAND = "Befehl"
+SEND_COMMAND = "Befehl senden"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Bitte wähle mindestens ein Modul aus der Liste aus!"
+SUCCESS_COMMAND_SEND = "Befehl erfolgreich gesendet!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Hostname"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_en.ini b/tasmoadmin/lang/lang_en.ini
@@ -250,6 +250,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Are you sure?"
 DELETE_DEVICE_CONFIRM_TEXT = "Do you really want to delete \"%s\" ( %s ) ?"
 ERROR = "Error"
 SHOW_MORE = "Show more"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Hostname"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_es.ini b/tasmoadmin/lang/lang_es.ini
@@ -249,6 +249,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Está Seguro?"
 DELETE_DEVICE_CONFIRM_TEXT = "Realmente desea borrar \"%s\" ( %s ) ?"
 ERROR = "Error"
 SHOW_MORE = "Mostrar más"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Nombre de Host"
 MAC = "MAC"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_fr.ini b/tasmoadmin/lang/lang_fr.ini
@@ -249,6 +249,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Confirmer?"
 DELETE_DEVICE_CONFIRM_TEXT = "Confirmer la suppression \"%s\" ( %s ) ?"
 ERROR = "Erreur"
 SHOW_MORE = "Plus d'infos"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Nom d'hote"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_it.ini b/tasmoadmin/lang/lang_it.ini
@@ -250,6 +250,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Are you sure?"
 DELETE_DEVICE_CONFIRM_TEXT = "Do you really want to delete \"%s\" ( %s ) ?"
 ERROR = "Error"
 SHOW_MORE = "Show more"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Hostname"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_nl.ini b/tasmoadmin/lang/lang_nl.ini
@@ -250,6 +250,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Weet u het zeker?"
 DELETE_DEVICE_CONFIRM_TEXT = "Wilt u echt verwijderen \"%s\" ( %s ) ?"
 ERROR = "Fout"
 SHOW_MORE = "Toon meer"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Hostname"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_pl.ini b/tasmoadmin/lang/lang_pl.ini
@@ -245,6 +245,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Czy jesteś pewien?"
 DELETE_DEVICE_CONFIRM_TEXT = "Czy na pewno chcesz usunąć \"%s\" ( %s ) ?"
 ERROR = "Błąd"
 SHOW_MORE = "Pokaż więcej"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Nazwa hosta"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/lang/lang_ru.ini b/tasmoadmin/lang/lang_ru.ini
@@ -250,6 +250,12 @@ DELETE_DEVICE_CONFIRM_TITLE = "Вы уверины?"
 DELETE_DEVICE_CONFIRM_TEXT = "Тично хотите удалить Устройство \"%s\" ( %s ) ?"
 ERROR = "Ошибка"
 SHOW_MORE = "смотреть больше"
+BTN_COMMAND = "Command"
+CB_COMMAND = "Command"
+SEND_COMMAND = "Send Command"
+ERROR_COMMAND_NO_DEVICE_SELECTED = "Please select at least one Device from the list!"
+SUCCESS_COMMAND_SEND = "Command send successfull!"
+ERROR_PLS_ENTER_COMMAND = "Please enter a command!"
 HOSTNAME = "Hostname"
 MAC = "Mac"
 MQTT = "MQTT"

diff --git a/tasmoadmin/pages/devices.php b/tasmoadmin/pages/devices.php
@@ -7,17 +7,15 @@
 ?>
 <?php if( isset( $devices ) && !empty( $devices ) ): ?>
 	<div class='row mb-1 mt-3'>
-		<div class='col-11 offset-1'>
-			<div class="form-group form-row justify-content-lg-start">
-				<div class="form-check ">
-					<input type="checkbox"
-					       class="form-check-input showmore d-none"
-					       id="showmore"
-					       name='showmore'>
-					<label class="form-check-label  btn btn-secondary" for="showmore">
-						<?php echo __( "SHOW_MORE", "DEVICES" ); ?>
-					</label>
-				</div>
+		<div class='col-12 col-sm-1 offset-0 offset-sm-1'>
+			<div class="form-group">
+				<input type="checkbox"
+				       class="form-check-input showmore d-none"
+				       id="showmore"
+				       name='showmore'>
+				<label class="form-check-label  btn btn-secondary" for="showmore">
+					<?php echo __( "SHOW_MORE", "DEVICES" ); ?>
+				</label>
 			</div>
 		</div>
 	</div>
@@ -30,6 +28,18 @@ class='table table-striped table-sm table-hover tablesaw tablesaw-stack'
 			       cellspacing='0'>
 				<thead>
 				<tr>
+					<th class='link cmd_cb d-none'>
+						<div class="form-check custom-control custom-checkbox">
+							<input class="form-check-input custom-control-input select_all"
+							       type="checkbox"
+							       value='select_all'
+							       id="select_all"
+							       name='select_all'>
+							<label class="form-check-label custom-control-label" for="select_all">
+								<?php echo __( "TABLE_HEAD_ALL", "DEVICES" ); ?>
+							</label>
+						</div>
+					</th>
 					<th><?php echo __( "TABLE_HEAD_POSITION", "DEVICES" ); ?></th>
 					<th class='more'><?php echo __( "TABLE_HEAD_ID", "DEVICES" ); ?></th>
 					<th><?php echo __( "TABLE_HEAD_NAME", "DEVICES" ); ?></th>
@@ -82,18 +92,37 @@ class='table table-striped table-sm table-hover tablesaw tablesaw-stack'
 								    data-device_ip='<?php echo $device_group->ip; ?>'
 								    data-device_relais='<?php echo $key+1; ?>'
 								>
+									<td class='cmd_cb d-none'>
+										<?php if( $key == 0 ): ?>
+											<div class="form-check custom-control custom-checkbox">
+												<input class="form-check-input custom-control-input device_checkbox"
+												       type="checkbox"
+												       value='<?php echo $device_group->id; ?>'
+												       id="cb_<?php echo $device_group->id; ?>"
+												       name='device_ids[]'>
+												<label class="form-check-label custom-control-label"
+												       for="cb_<?php echo $device_group->id; ?>">
+													<?php echo __( "CB_COMMAND", "DEVICES" ); ?>
+												</label>
+											</div>
+										<?php endif; ?>
+									</td>
 									<td class='dblcEdit'
 									    data-target='csv'
 									    data-field='position'>
 										<?php echo $device_group->position; ?>
 									</td>
 									<td class='more static'><?php echo $device_group->id; ?></td>
-									<td><a href='http://<?php echo $device_group->ip; ?>/'
-									       target='_blank'
-									       title='<?php echo __(
-										       "LINK_OPEN_DEVICE_WEBUI",
-										       "DEVICES"
-									       ); ?>'><?php echo str_replace( " ", "&nbsp;", $devicename ); ?></a>
+									<td class='device_name'><a href='http://<?php echo $device_group->ip; ?>/'
+									                           target='_blank'
+									                           title='<?php echo __(
+										                           "LINK_OPEN_DEVICE_WEBUI",
+										                           "DEVICES"
+									                           ); ?>'><?php echo str_replace(
+												" ",
+												"&nbsp;",
+												$devicename
+											); ?></a>
 									</td>
 									<td><?php echo $device_group->ip; ?></td>
 									<td class='status'>
@@ -317,6 +346,18 @@ class='table table-striped table-sm table-hover tablesaw tablesaw-stack'
 				</tbody>
 				<tfoot>
 				<tr class='bottom'>
+					<th class='link cmd_cb d-none'>
+						<div class="form-check custom-control custom-checkbox">
+							<input class="form-check-input custom-control-input select_all"
+							       type="checkbox"
+							       value='select_all'
+							       id="select_all"
+							       name='select_all'>
+							<label class="form-check-label custom-control-label" for="select_all">
+								<?php echo __( "TABLE_HEAD_ALL", "DEVICES" ); ?>
+							</label>
+						</div>
+					</th>
 					<th><?php echo __( "TABLE_HEAD_POSITION", "DEVICES" ); ?></th>
 					<th class='more'><?php echo __( "TABLE_HEAD_ID", "DEVICES" ); ?></th>
 					<th><?php echo __( "TABLE_HEAD_NAME", "DEVICES" ); ?></th>
@@ -359,19 +400,34 @@ class='table table-striped table-sm table-hover tablesaw tablesaw-stack'
 		</div>
 	</div>
 	<div class='row mt-3'>
-		<div class='col-11 offset-1'>
-			<div class="form-group form-row justify-content-lg-start">
-				<div class="form-check ">
-					<input type="checkbox"
-					       class="form-check-input showmore d-none"
-					       id="showmore"
-					       name='showmore'>
-					<label class="form-check-label  btn btn-secondary" for="showmore">
-						<?php echo __( "SHOW_MORE", "DEVICES" ); ?>
-					</label>
-				</div>
+		<div class='col-auto offset-0 offset-sm-1'>
+			<div class="form-group">
+				<input type="checkbox"
+				       class="form-check-input showmore d-none"
+				       id="showmore"
+				       name='showmore'>
+				<label class="form-check-label  btn btn-secondary" for="showmore">
+					<?php echo __( "SHOW_MORE", "DEVICES" ); ?>
+				</label>
 			</div>
 		</div>
+		<div class="col-auto">
+			<button class='btn btn-secondary showCommandInput'>
+				<?php echo __( "BTN_COMMAND", "DEVICES" ); ?>
+			</button>
+		</div>
+	</div>
+	<div class='cmdContainer row command-hidden d-none'>
+		<div class="form-group col-12 col-sm-6 col-md-7 col-lg-8 offset-0 offset-sm-1 mb-1 mb-sm-0">
+			<input type='text' name='command' class='form-control commandInput'>
+		</div>
+		<div class="form-group col-12 col-sm-4 col-md-3 col-lg-2 mb-0">
+			<button type='submit' class='btn btn-primary sendCommand w-100' name='sendCommand'>
+				<?php echo __( "SEND_COMMAND", "DEVICES" ); ?>
+			</button>
+		</div>
+		<small id="commandInputError" class="form-text col-12 col-sm-11 offset-0 offset-sm-1 d-none">
+		</small>
 	</div>
 <?php else: ?>
 	<div class='row'>

diff --git a/tasmoadmin/resources/css/style.css b/tasmoadmin/resources/css/style.css
@@ -313,6 +313,10 @@ td.runtime {
 	width : auto;
 }
 
+.table tfoot th {
+	border-top : 2px solid #DEE2E6;
+}
+
 .hidden,
 .tablesaw-stack td.hidden, .tablesaw-stack th.hidden, .tablesaw-stack thead td.hidden, .tablesaw-stack thead th.hidden {
 	display : none;
@@ -326,6 +330,14 @@ hr {
 	color : #4B4B4B;
 }
 
+#commandInputError {
+	color : green;
+}
+
+.has-error #commandInputError {
+	color : red;
+}
+
 .nightmode {
 	background-color : #44494F;
 	color            : rgba(255, 255, 255, 0.5);
@@ -457,3 +469,12 @@ hr {
 .nightmode .btn-secondary:hover {
 	color : #FFFFFF;
 }
+
+.btn {
+	-webkit-touch-callout : none;
+	-webkit-user-select   : none;
+	-khtml-user-select    : none;
+	-moz-user-select      : none;
+	-ms-user-select       : none;
+	user-select           : none;
+}