Skip to content

Commit

Permalink
Merge pull request #221 from Jeedom-Zigate/beta
Browse files Browse the repository at this point in the history 
v1.4.0
  • Loading branch information
@doudz
doudz authored Oct 30, 2019
2 parents 545c073 + 171ea70 commit 9d827b7
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 98 deletions.
8 changes: 0 additions & 8 deletions desktop/js/zigate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@ $('#bt_reset').on('click', function () {
reset();
});

$('#bt_touchlink').on('click', function () {
callZiGate('initiate_touchlink');
});

$('#bt_networkscan').on('click', function () {
callZiGate('start_network_scan');
});

$('#bt_cleanup_devices').on('click', function () {
bootbox.confirm('{{Etes-vous sûr de vouloir effacer les équipements manquants ?}}', function (result) {
if (result) {
Expand Down
139 changes: 53 additions & 86 deletions desktop/php/zigate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,119 +32,86 @@
?>

<div class="row row-overflow">
<div class="col-lg-2 col-md-3 col-sm-4">
<div class="bs-sidebar">
<ul id="ul_eqLogic" class="nav nav-list bs-sidenav">
<li class="filter" style="margin-bottom: 5px;"><input class="filter form-control input-sm" placeholder="{{Rechercher}}" style="width: 100%"/></li>
<?php
foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : jeedom::getConfiguration('eqLogic:style:noactive');
echo '<li class="cursor li_eqLogic" data-eqLogic_id="' . $eqLogic->getId() . '" style="' . $opacity .'"><a>' . $eqLogic->getHumanName(true) . '</a></li>';
}
?>
</ul>
</div>
</div>

<div class="col-lg-10 col-md-9 col-sm-8 eqLogicThumbnailDisplay" style="border-left: solid 1px #EEE; padding-left: 25px;">
<legend><i class="fa fa-cog"></i> {{Gestion}}</legend>
<div class="col-xs-12 eqLogicThumbnailDisplay">
<legend><i class="fas fa-cog"></i> {{Gestion}}</legend>
<div class="eqLogicThumbnailContainer">
<div class="cursor eqLogicAction" id="bt_permitJoin" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;" >
<center>
<i class="fa fa-sign-in fa-rotate-90" style="font-size : 6em;color:#94ca02;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#94ca02"><center>{{Mode inclusion}}</center></span>
</div>
<div class="cursor eqLogicAction" id="bt_touchlink" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;" >
<center>
<i class="fa fa-link" style="font-size : 6em;color:#0299ca;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#0299ca"><center>{{TouchLink}}</center></span>
</div>
<div class="cursor eqLogicAction" id="bt_networkscan" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;" >
<center>
<i class="fa fa-search" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><center>{{Scan réseau}}</center></span>
<div class="cursor eqLogicAction logoPrimary" id="bt_permitJoin">
<i class="fas fa-sign-in-alt fa-rotate-90"></i>
<br/>
<span>{{Mode inclusion}}</span>
</div>
<div class="cursor eqLogicAction" id="bt_syncEqLogic" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;">
<center>
<i class="fa fa-refresh" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><center>{{Synchroniser}}</center></span>
<div class="cursor eqLogicAction" id="bt_syncEqLogic">
<i class="fas fa-sync"></i>
<br/>
<span>{{Synchroniser}}</span>
</div>
<div class="cursor eqLogicAction" id="bt_cleanup_devices" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;">
<center>
<i class="fa fa-shower" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><p class="text-center">{{Nettoyer}}</p></span>
<div class="cursor eqLogicAction" id="bt_cleanup_devices">
<i class="fas fa-shower"></i>
<br/>
<span>{{Nettoyer}}</span>
</div>
<div class="cursor eqLogicAction" id="bt_reset" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;" >
<center>
<i class="fa fa-recycle" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><center>{{Redémarrage Zigate}}</center></span>
<div class="cursor eqLogicAction" id="bt_reset" >
<i class="fas fa-recycle"></i>
<br/>
<span>{{Redémarrage Zigate}}</span>
</div>
<div class="cursor eqLogicAction" id="bt_erasepdm" style="background-color : #ffffff; height : 140px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;">
<center>
<i class="fa fa-eraser" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><p class="text-center">{{Effacement Zigate}}</p></span>
<div class="cursor eqLogicAction" id="bt_erasepdm">
<i class="fas fa-eraser"></i>
<br/>
<span>{{Effacement Zigate}}</span>
</div>
<div class="cursor eqLogicAction" data-action="gotoPluginConf" style="text-align: center; background-color : #ffffff; height : 120px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;">
<center>
<i class="fa fa-wrench" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676">{{Configuration}}</span>
<div class="cursor eqLogicAction" data-action="gotoPluginConf">
<i class="fas fa-wrench"></i>
<br/>
<span>{{Configuration}}</span>
</div>
<div class="cursor" id="bt_healthzigate" style="background-color : #ffffff; height : 120px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;" >
<center>
<i class="fa fa-medkit" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><center>{{Santé}}</center></span>
<div class="cursor" id="bt_healthzigate">
<i class="fas fa-medkit"></i>
<br/>
<span>{{Santé}}</span>
</div>
<div class="cursor" id="bt_terminalzigate" style="background-color : #ffffff; height : 120px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 140px;margin-left : 10px;" >
<center>
<i class="fa fa-terminal" style="font-size : 6em;color:#767676;"></i>
</center>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;color:#767676"><center>{{Terminal}}</center></span>
<div class="cursor" id="bt_terminalzigate">
<i class="fas fa-terminal"></i>
<br/>
<span>{{Terminal}}</span>
</div>
</div>

<legend><i class="fa fa-table"></i> {{Mes équipements ZiGate}}</legend>
<input class="form-control" placeholder="{{Rechercher}}" style="margin-bottom:4px;" id="in_searchEqlogic" />
<legend><i class="fas fa-table"></i> {{Mes équipements ZiGate}}</legend>
<input class="form-control" placeholder="{{Rechercher}}" id="in_searchEqlogic" />
<div class="eqLogicThumbnailContainer">
<?php

foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : jeedom::getConfiguration('eqLogic:style:noactive');
echo '<div class="eqLogicDisplayCard cursor" data-logical-id="' . $eqLogic->getLogicalId() . '" data-eqLogic_id="' . $eqLogic->getId() . '" style="background-color : #ffffff; height : 200px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 160px;margin-left : 10px;' . $opacity . '" >';
$opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard';
echo '<div class="eqLogicDisplayCard cursor '.$opacity.'" data-logical-id="' . $eqLogic->getLogicalId() . '" data-eqLogic_id="' . $eqLogic->getId() . '">';
echo "<center>";
echo '<img src="' . $eqLogic->getImage() . '" height="105" width="95" />';
echo "</center>";
echo '<span class="name" style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;"><center>' . $eqLogic->getHumanName(true, true) . '</center></span>';
echo '<span class="name" ' . $eqLogic->getHumanName(true, true) . '</span>';
echo '</div>';
}
// phpcs:enable Generic.Files.LineLength.TooLong
?>

</div>
</div>

<div class="col-lg-10 col-md-9 col-sm-8 eqLogic" style="border-left: solid 1px #EEE; padding-left: 25px;display: none;">
<a class="btn btn-success eqLogicAction pull-right" data-action="save"><i class="fa fa-check-circle"></i> {{Sauvegarder}}</a>
<a class="btn btn-danger eqLogicAction pull-right" data-action="remove"><i class="fa fa-minus-circle"></i> {{Supprimer}}</a>
<a class="btn btn-default eqLogicAction pull-right" data-action="configure"><i class="fa fa-cogs"></i> {{Configuration avancée}}</a>
<a class="btn btn-success eqLogicAction pull-right" data-action="refresh_device"><i class="fa fa-refresh"></i> {{Rafraichir l'équipement}}</a>
<a class="btn btn-success eqLogicAction pull-right" data-action="discover_device"><i class="fa fa-refresh"></i> {{Découvrir l'équipement}}</a>
<a class="btn btn-success eqLogicAction pull-right" data-action="identify_device"><i class="fa fa-refresh"></i> {{Identifier}}</a>
<div class="col-xs-12 eqLogic" style="display: none;">
<div class="input-group pull-right" style="display:inline-flex">
<span class="input-group-btn">
<a class="btn btn-success eqLogicAction roundedLeft" data-action="save"><i class="fas fa-check-circle"></i> {{Sauvegarder}}</a>
<a class="btn btn-danger eqLogicAction" data-action="remove"><i class="fas fa-minus-circle"></i> {{Supprimer}}</a>
<a class="btn btn-default eqLogicAction" data-action="configure"><i class="fas fa-cogs"></i> {{Configuration avancée}}</a>
<a class="btn btn-success eqLogicAction" data-action="refresh_device"><i class="fas fa-refresh"></i> {{Rafraichir l'équipement}}</a>
<a class="btn btn-success eqLogicAction" data-action="discover_device"><i class="fas fa-refresh"></i> {{Découvrir l'équipement}}</a>
<a class="btn btn-success eqLogicAction roundedRight" data-action="identify_device"><i class="fas fa-refresh"></i> {{Identifier}}</a>
</span>
</div>

<ul class="nav nav-tabs" role="tablist">
<li role="presentation"><a href="#" class="eqLogicAction" aria-controls="home" role="tab" data-toggle="tab" data-action="returnToThumbnailDisplay">
<i class="fa fa-arrow-circle-left"></i></a>
<i class="fas fa-arrow-circle-left"></i></a>
</li>
<li role="presentation" class="active"><a href="#eqlogictab" aria-controls="home" role="tab" data-toggle="tab"><i class="fa fa-tachometer"></i> {{Equipement}}</a></li>
<li role="presentation"><a href="#commandtab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-list-alt"></i> {{Commandes}}</a></li>
<li role="presentation" class="active"><a href="#eqlogictab" aria-controls="home" role="tab" data-toggle="tab"><i class="fas fa-tachometer"></i> {{Equipement}}</a></li>
<li role="presentation"><a href="#commandtab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fas fa-list-alt"></i> {{Commandes}}</a></li>
</ul>

<div class="tab-content" style="height:calc(100% - 50px);overflow:auto;overflow-x: hidden;">
Expand Down
2 changes: 1 addition & 1 deletion plugin_info/configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{{ Version lib }}
<sup><i class="fa fa-question-circle tooltips" title="{{C'est la version de la librairie Python ZiGate}}" style="font-size : 1em;color:grey;"></i></sup>
</label>
<span style="top:6px;" class="col-lg-4"><?php echo $versionLib['result']; ?></span>
<span style="top:6px;" class="col-lg-4"><?php echo $versionLib['result']; ?><a class="btn btn-success" id="btn_upgradefirmware">{{Mise à jour du firmware}}</a></span>
</div>
<div class="form-group">
<label class="col-lg-4 control-label">
Expand Down
4 changes: 2 additions & 2 deletions plugin_info/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"changelog": "https://jeedom-zigate.github.io/jeedom-plugin-zigate/fr_FR/changelog",
"documentation": "https://jeedom-zigate.github.io/jeedom-plugin-zigate",
"language": ["fr_FR", "en_US"],
"compatibility": ["Jeedomboard", "RPI/RPI2", "Docker", "DIY"],
"pluginVersion": "1.3.5"
"compatibility": ["miniplus", "smart", "rpi", "docker", "diy"],
"pluginVersion": "1.4.0"
}
2 changes: 1 addition & 1 deletion resources/zigate_version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.32.2
0.33.1

0 comments on commit 9d827b7

Please sign in to comment.