Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete review of the "orders" page #31

Merged
merged 4 commits into from
Mar 20, 2024
Merged

Complete review of the "orders" page #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
290897b
Update z2m.js
Furaxworld Mar 19, 2024
84f4d08
Update z2m.php
Furaxworld Mar 19, 2024
2153b8e
Update z2m.php
Furaxworld Mar 19, 2024
f9ccb5d
Update configuration.php
Furaxworld Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions desktop/js/z2m.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,42 +155,42 @@ if (!isset(_cmd.configuration)) {
_cmd.configuration = {};
}
var tr = '<tr class="cmd" data-cmd_id="' + init(_cmd.id) + '">';
tr += '<td class="hidden-xs">';
tr += '<span class="cmdAttr" data-l1key="id"></span>';
tr += '</td>';
tr += '<td>';
tr += '<div class="row">';
tr += '<div class="col-sm-6">';
tr += '<a class="cmdAction btn btn-default btn-sm" data-l1key="chooseIcon"><i class="fa fa-flag"></i> Icône</a>';
tr += '<span class="cmdAttr" data-l1key="display" data-l2key="icon" style="margin-left : 10px;"></span>';
tr += '</div>';
tr += '<div class="col-sm-6">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="name">';
tr += '</div>';
tr += '<div class="input-group">';
tr += '<input class="cmdAttr form-control input-sm roundedLeft" data-l1key="name" placeholder="{{Nom de la commande}}">';
tr += '<span class="input-group-btn">';
tr += '<a class="cmdAction btn btn-sm btn-default" data-l1key="chooseIcon" title="{{Choisir une icône}}"><i class="fas fa-icons"></i></a>';
tr += '</span>';
tr += '<span class="cmdAttr input-group-addon roundedRight" data-l1key="display" data-l2key="icon" style="font-size:19px;padding:0 5px 0 0!important;"></span>';
tr += '</div>';
tr += '<select class="cmdAttr form-control input-sm" data-l1key="value" style="display : none;margin-top : 5px;" title="La valeur de la commande vaut par défaut la commande">';
tr += '<option value="">Aucune</option>';
tr += '</select>';
tr += '</td>';
tr += '<td>';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="id" style="display : none;">';
tr += '<span class="type" type="' + init(_cmd.type) + '">' + jeedom.cmd.availableType() + '</span>';
tr += '<span class="subType" subType="' + init(_cmd.subType) + '"></span>';
tr += '</td>';
tr += '<td>';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="logicalId" style="width : 70%; display : inline-block;" placeholder="{{Commande}}"><br/>';
tr += '<input class="cmdAttr form-control input-sm cmdActionOnly" data-l1key="configuration" data-l2key="subPayload" style="width : 70%; display : inline-block;" placeholder="{{Sous topic}}">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="logicalId" style="width : 95%; display : inline-block;" placeholder="{{Commande}}"><br/>';
tr += '<input class="cmdAttr form-control input-sm cmdActionOnly" data-l1key="configuration" data-l2key="subPayload" style="width : 95%; margin-top : 5px; display : inline-block;" placeholder="{{Sous topic}}">';
tr += '</td>';

tr += '<td>';

tr += '<input class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="returnStateValue" placeholder="{{Valeur retour d\'état}}" style="width:48%;display:inline-block;">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="returnStateTime" placeholder="{{Durée avant retour d\'état (min)}}" style="width:48%;display:inline-block;margin-left:2px;">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="returnStateValue" placeholder="{{Valeur retour d\'état}}" style="width:40%;display:inline-block;">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="returnStateTime" placeholder="{{Durée avant retour d\'état (min)}}" style="width:57%;display:inline-block;margin-left:2px;">';
tr += '<select class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="updateCmdId" style="display : none;" title="Commande d\'information à mettre à jour">';
tr += '<option value="">Aucune</option>';
tr += '</select>';
tr += '</td>';
tr += '<td>';
tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="minValue" placeholder="{{Min}}" title="{{Min}}" style="width:30%;display:inline-block;">';
tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="maxValue" placeholder="{{Max}}" title="{{Max}}" style="width:30%;display:inline-block;">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="unite" placeholder="Unité" title="{{Unité}}" style="width:30%;display:inline-block;margin-left:2px;">';
tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="minValue" placeholder="{{Min}}" title="{{Min}}" style="width:25%;display:inline-block;margin-right:7px;">';
tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="maxValue" placeholder="{{Max}}" title="{{Max}}" style="width:25%;display:inline-block;margin-right:7px;">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="unite" placeholder="Unité" title="{{Unité}}" style="width:25%;display:inline-block;margin-right:7px;">';
tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="listValue" placeholder="{{Liste de valeur|texte séparé par ;}}" title="{{Liste}}">';
tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="isVisible" checked/>{{Afficher}}</label></span> ';
tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="isHistorized" checked/>{{Historiser}}</label></span> ';
Expand Down
7 changes: 4 additions & 3 deletions desktop/php/z2m.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,13 @@
<table id="table_cmd" class="table table-bordered table-condensed">
<thead>
<tr>
<th style="width: 400px;">{{Nom}}</th>
<th class="hidden-xs" style="min-width:50px;width:70px;">{{ID}}</th>
<th style="width: 250px;">{{Nom}}</th>
<th style="width: 130px;">{{Type}}</th>
<th style="width: 250px;">{{Logical ID}}</th>
<th>{{Paramètres}}</th>
<th style="width:360px;">{{Paramètres}}</th>
<th style="width:300px;">{{Options}}</th>
<th>{{Etat}}</th>
<th style="width:100px;">{{Etat}}</th>
<th style="width: 150px;">{{Action}}</th>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion plugin_info/configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</div>
<div class="form-group z2m_mode local">
<label class="col-md-4 control-label">{{Version voulue (réservé aux utilisateurs avancés)}}
<sup><i class="fas fa-question-circle tooltips" title="{{Laisser vide pour mettre la dernière version disponible}}"></i></sup>
<sup><i class="fas fa-question-circle tooltips" title="{{Laisser vide pour installer la dernière version disponible <br/>Si vous voulez forcer une installation précise, cliquez sur le bouton &#x2192; Liste des versions <br/> Encodez la version voulue et pensez à sauvegarder avant de relancer les dépendances}}"></i></sup>
</label>
<div class="col-md-3">
<input class="configKey form-control" data-l1key="wanted_z2m_version" />
Expand Down
Loading