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

Ia7 #517

Merged
merged 4 commits into from
Jun 13, 2015
Merged

Ia7 #517

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
9234f2c
v1.0.200
hplato May 2, 2015
78513f3
Removed hardcoded version 4.0 from main.html. Would still like to fig…
hplato May 2, 2015
ea5c45b
Big update, added ability to add a controllable item to the collectio…
hplato May 4, 2015
b3ba715
Removed sort routine from javascript.js and sorted all group members …
hplato Jun 6, 2015
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
8 changes: 8 additions & 0 deletions data/web/ia7_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"prefs" : {
"header_button" : "yes",
"state_log_show" : "yes",
"state_log_entries" : "4",
"always_double_buttons" : "no"
}
}
40 changes: 34 additions & 6 deletions lib/json_server.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ sub json_get {
my $collection_file = "$Pgm_Root/data/web/collections.json";
$collection_file = "$config_parms{data_dir}/web/collections.json"
if -e "$config_parms{data_dir}/web/collections.json";
# Consider copying the source file to the user data dir here.
$collection_file = "$config_parms{ia7_data_dir}/collections.json"
if -e "$config_parms{ia7_data_dir}/collections.json";

eval {
my $json_collections = file_read($collection_file);
Expand All @@ -175,6 +176,25 @@ sub json_get {
}
}

# List ia7 preferences
if ($path[0] eq 'ia7_config' || $path[0] eq '') {
my $prefs_file = "$Pgm_Root/data/web/ia7_config.json";
$prefs_file = "$config_parms{data_dir}/web/ia7_config.json"
if -e "$config_parms{data_dir}/web/ia7_config.json";
$prefs_file = "$config_parms{ia7_data_dir}/ia7_config.json"
if -e "$config_parms{ia7_data_dir}/ia7_config.json";

eval {
my $prefs = file_read($prefs_file);
$json_data{'ia7_config'} = decode_json($prefs); #HP, wrap this in eval to prevent MH crashes
};
if ($@){
print_log "Json_Server.pl: WARNING: decode_json failed for ia7_config.json. Please check this file!";
$json_data{'ia7_config'} = decode_json('{ "prefs" : { "status" : "error" } }'); #write a blank collection

}
}

# List objects
if ($path[0] eq 'objects' || $path[0] eq '') {
$json_data{objects} = {};
Expand Down Expand Up @@ -507,11 +527,16 @@ sub build_parent_table {
for my $group_name (&list_objects_by_type('Group')) {
my $group = &get_object_by_name($group_name);
$group_name =~ s/\$|\%|\&|\@//g;
for my $object ($group->list(undef, undef,1)) {
my $obj_name = $object->get_object_name;
unless (defined $group) {
print_log "json: build_parent_table, group_name $group_name doesn't have an object?" if $Debug{json};
next;
} else {
for my $object ($group->list(undef, undef,1)) {
my $obj_name = $object->get_object_name;
push (@{$parent_table{$obj_name}}, $group_name);
}
}
}
}
}
return \%parent_table;
}

Expand Down Expand Up @@ -604,10 +629,13 @@ sub json_object_detail {
## can add linked items too.
if (ref($object) eq 'Group') {
$value = [];
my @tmp; ## pull all the members into a temp array that can be sorted
for my $obj_name (&list_objects_by_group($object->get_object_name, 1)) {
$obj_name =~ s/\$|\%|\&|\@//g;
push (@{$value}, $obj_name);
#push (@{$value}, $obj_name);
push (@tmp, $obj_name);
}
push (@{$value}, sort @tmp);
}
}
elsif ($f eq 'parents'){
Expand Down
4 changes: 2 additions & 2 deletions web/ia7/house/main.shtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class='row top-buffer'>
<div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
<div class='col-sm-12'>
<p><strong>Version: </strong>4.0 <!--#include var="$Version"--><br>
<p><strong>Version: </strong><!--#include var="$Version"--><br>
<strong>Modified:</strong> <!--#include var="$Version_date"--><br>
<strong>OS:</strong> <!--#include var="$^O"--><br>
<strong>Perl:</strong> <!--#include code="sprintf '%vd', $^V;"--><br>
Expand Down Expand Up @@ -72,7 +72,7 @@
<div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
<div class='col-sm-12'>
<p class="text-muted"><small> MisterHouse was created by Bruce Winter. Ron Klinkien developed the v2.3 web interface. Kevin Robert Keegan
developed the v4 IA7 web interface, updates by H.Plato. IA7 v1.0.100</small></p>
developed the v4 IA7 web interface, updates by H.Plato. IA7 v1.0.300</small></p>
</div>
</div>
</div>
178 changes: 129 additions & 49 deletions web/ia7/include/javascript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Optimization opportunity
// common code for setting states, should move to subroutine
// Should be able to merge print_log, print_speaklog and the non-existant print_errorlog into a
// single method
// updateStaticPage has lots of copy paste
// add print_errorlog
// updateStaticPage has lots of copy paste


var entity_store = {}; //global storage of entities
Expand Down Expand Up @@ -123,6 +121,27 @@ function changePage (){
// collections
URLHash.path = "collections";
}
if (getJSONDataByPath("ia7_config") === undefined){
// We need at minimum the basic collections data to render all pages
// (the breadcrumb)
// NOTE may want to think about how to handle dynamic changes to the
// collections list
$.ajax({
type: "GET",
url: "/json/ia7_config",
dataType: "json",
success: function( json ) {
JSONStore(json);
changePage();
}
});
} else {
//console.log("x "+json_store.ia7_config.prefs.substate_percentages);
if (json_store.ia7_config.prefs.header_button == "no") {
$("#mhstatus").remove();
}
if (json_store.ia7_config.prefs.substate_percentages === undefined) json_store.ia7_config.prefs.substate_percentages = 20;
}
if (getJSONDataByPath("collections") === undefined){
// We need at minimum the basic collections data to render all pages
// (the breadcrumb)
Expand Down Expand Up @@ -205,7 +224,7 @@ function changePage (){
nav_name = collection_keys_arr[i].replace("$", '');
nav_link = '#path=/objects&parents='+nav_name;
if (nav_name == "Group") nav_link = '#path=objects&type=Group'; //Hardcode this use case
if (json_store.objects[nav_name].label != undefined) nav_name = (json_store.objects[nav_name].label);
if (json_store.objects[nav_name].label !== undefined) nav_name = (json_store.objects[nav_name].label);

}
else {
Expand Down Expand Up @@ -329,9 +348,9 @@ var loadList = function() {

// Sort that list if a sort exists, probably exists a shorter way to
// write the sort
if (sort_list !== undefined){
entity_list = sortArrayByArray(entity_list, sort_list);
}
// if (sort_list !== undefined){
// entity_list = sortArrayByArray(entity_list, sort_list);
// }

for (var i = 0; i < entity_list.length; i++) {
var entity = entity_list[i];
Expand Down Expand Up @@ -407,9 +426,13 @@ var loadList = function() {
var color = getButtonColor(json_store.objects[entity].state);
if (json_store.objects[entity].label !== undefined) name = json_store.objects[entity].label;
//Put objects into button
var dbl_btn = "";
if (json_store.ia7_config.prefs.always_double_buttons == "yes") {
if (name.length < 30) dbl_btn = "<br>";
}
button_html = "<div style='vertical-align:middle'><button entity='"+entity+"' ";
button_html += "class='btn btn-"+color+" btn-lg btn-block btn-list btn-popover btn-state-cmd navbutton-padding'>";
button_html += name+"<span class='pull-right'>"+json_store.objects[entity].state+"</span></button></div>";
button_html += name+dbl_btn+"<span class='pull-right'>"+json_store.objects[entity].state+"</span></button></div>";
entity_arr.push(button_html);
}
}//entity each loop
Expand Down Expand Up @@ -483,7 +506,7 @@ var filterSubstate = function (state) {
if (state.indexOf('%') >= 0) {

var number = parseInt(state, 10)
if (number % 20 != 0) {
if (number % json_store.ia7_config.prefs.substate_percentages != 0) {
filter = 1
}
}
Expand Down Expand Up @@ -602,13 +625,10 @@ var updateItem = function(item,link,time) {
if (time === undefined) {
time = "";
}
var split_path = HashtoJSONArgs(URLHash).split("?");
var path_str = split_path[0];
var arg_str = split_path[1];
path_str = "/objects" // override, for now, would be good to add voice_cmds
var path_str = "/objects" // override, for now, would be good to add voice_cmds
//arg_str=link=%2Fia7%2Fhouse%2Fgarage.shtml&fields=state%2Ctype&long_poll=true&time=1426011733833.94
//arg_str = "fields=state,states,label&long_poll=true&time="+time;
arg_str = "fields=state&long_poll=true&items="+item+"&time="+time;
var arg_str = "fields=state,states,label,state_log&long_poll=true&items="+item+"&time="+time;
//alert("path_str="+path_str+" arg_str="+arg_str)
updateSocket = $.ajax({
type: "GET",
Expand Down Expand Up @@ -721,6 +741,7 @@ var loadCollection = function(collection_keys) {
var collection_keys_arr = collection_keys.split(",");
var last_collection_key = collection_keys_arr[collection_keys_arr.length-1];
var entity_arr = [];
var items = "";
var entity_sort = json_store.collections[last_collection_key].children;
if (entity_sort.length <= 0){
entity_arr.push("Childless Collection");
Expand All @@ -733,28 +754,57 @@ var loadCollection = function(collection_keys) {
var name = json_store.collections[collection].name;
var mode = json_store.collections[collection].mode;
var keys = json_store.collections[collection].keys; //for legacy CGI scripts to recreate proper URL
var item = json_store.collections[collection].item;

if (json_store.collections[collection].iframe !== undefined) {
link = "/ia7/include/iframe.shtml?"+json_store.collections[collection].iframe;
}
var hidden = "";
if (mode != display_mode && mode != undefined ) hidden = "hidden"; //Hide any simple/advanced buttons
var next_collection_keys = collection_keys + "," + entity_sort[i];
if (keys === "true") {
var arg = "?";
if (link.indexOf("?") >= 0 ) { //already has arguments, so just add one on
arg = "&";
if (item !== undefined) {
if (json_store.objects[item] === undefined) {
var path_str = "/objects";
var arg_str = "fields=state,states,label,state_log&items="+item;
$.ajax({
type: "GET",
url: "/json"+path_str+"?"+arg_str,
dataType: "json",
success: function( json ) {
JSONStore(json);
loadCollection(collection_keys);
}
});
} else {
var name = item;
var color = getButtonColor(json_store.objects[item].state);
if (json_store.objects[item].label !== undefined) name = json_store.objects[item].label;
var dbl_btn = "";
if (name.length < 30) dbl_btn = "<br>";
var button_html = "<div style='vertical-align:middle'><button entity='"+item+"' ";
button_html += "class='btn btn-"+color+" btn-lg btn-block btn-list btn-popover btn-state-cmd navbutton-padding'>";
button_html += name+dbl_btn+"<span class='pull-right'>"+json_store.objects[item].state+"</span></button></div>";
entity_arr.push(button_html);
items += item+",";
}
link += arg+"ia7="+next_collection_keys;
}
link = buildLink (link, next_collection_keys);
if (json_store.collections[collection].external !== undefined) {
link = json_store.collections[collection].external;

} else {
if (json_store.collections[collection].iframe !== undefined) {
link = "/ia7/include/iframe.shtml?"+json_store.collections[collection].iframe;
}
var hidden = "";
if (mode != display_mode && mode != undefined ) hidden = "hidden"; //Hide any simple/advanced buttons
var next_collection_keys = collection_keys + "," + entity_sort[i];
if (keys === "true") {
var arg = "?";
if (link.indexOf("?") >= 0 ) { //already has arguments, so just add one on
arg = "&";
}
link += arg+"ia7="+next_collection_keys;
}
link = buildLink (link, next_collection_keys);
if (json_store.collections[collection].external !== undefined) {
link = json_store.collections[collection].external;
}
var icon_set = "fa";
if (icon.indexOf("wi-") !=-1) icon_set = "wi";
var button_html = "<a link-type='collection' href='"+link+"' class='btn btn-default btn-lg btn-block btn-list "+hidden+" navbutton-padding' role='button'><i class='"+icon_set+" "+icon+" icon-larger fa-2x fa-fw'></i>"+name+"</a>";
entity_arr.push(button_html);
}
var icon_set = "fa";
if (icon.indexOf("wi-") !=-1) icon_set = "wi";
var button_html = "<a link-type='collection' href='"+link+"' class='btn btn-default btn-lg btn-block btn-list "+hidden+" navbutton-padding' role='button'><i class='"+icon_set+" "+icon+" fa-2x fa-fw'></i>"+name+"</a>";
entity_arr.push(button_html);
}
//loop through array and print buttons
var row = 0;
Expand All @@ -774,6 +824,19 @@ var loadCollection = function(collection_keys) {
}
column++;
}
// if any items present, then create modals and activate updateItem...
if (items !== "") {
items = items.slice(0,-1); //remove last comma
//console.log("items="+items);
$('.btn-state-cmd').click( function () {
var entity = $(this).attr("entity");
//console.log("entity="+entity);
create_state_modal(entity);
});
// test multiple items at some point
updateItem(items);
}

};

//Constructs a link, likely should be replaced by HashToURL
Expand Down Expand Up @@ -1068,22 +1131,23 @@ var create_state_modal = function(entity) {
var advanced_html = "";
for (var i = 0; i < modal_states.length; i++){
if (filterSubstate(modal_states[i]) == 1) {
advanced_html += "<button class='btn btn-default hidden'>"+modal_states[i]+"</button>";
advanced_html += "<button class='btn btn-default col-sm-3 col-xs-3 hidden'>"+modal_states[i]+"</button>";
continue
} else {
buttonlength += 2 + modal_states[i].length //TODO: Maybe just count buttons to create groups.
//TODO: Maybe just count buttons to create groups, organize them a bit better, <4 buttons, do a block?
buttonlength += 2 + modal_states[i].length
}
if (buttonlength >= 25) {
stategrp++;
$('#control').find('.states').append("<div class='btn-group stategrp"+stategrp+" btn-block'></div>");
$('#control').find('.states').append("<div class='btn-group btn-block stategrp"+stategrp+"'></div>");
buttonlength = 0;
}
var color = getButtonColor(modal_states[i])
var disabled = ""
if (modal_states[i] == json_store.objects[entity].state) {
disabled = "disabled";
}
$('#control').find('.states').find(".stategrp"+stategrp).append("<button class='btn col-sm-3 btn-"+color+" "+disabled+"'>"+modal_states[i]+"</button>");
$('#control').find('.states').find(".stategrp"+stategrp).append("<button class='btn col-sm-3 col-xs-3 btn-"+color+" "+disabled+"'>"+modal_states[i]+"</button>");

}
$('#control').find('.states').append("<div class='btn-group advanced btn-block'>"+advanced_html+"</div>");
Expand All @@ -1096,17 +1160,18 @@ var create_state_modal = function(entity) {
//remove states from anything that doesn't have more than 1 state
$('#control').find('.states').find('.btn-group').remove();
}
//state log show last 4 (separate out set_by as advanced) - keeps being added to each time it opens
// could load all log items, and only unhide the last 4 -- maybe later
$('#control').find('.modal-body').find('.obj_log').remove();
if (json_store.ia7_config.prefs.state_log_show !== "no") {
//state log show last 4 (separate out set_by as advanced) - keeps being added to each time it opens
// could load all log items, and only unhide the last 4 -- maybe later
$('#control').find('.modal-body').find('.obj_log').remove();

$('#control').find('.modal-body').append("<div class='obj_log'><h4>Object Log</h4>");
for (var i = 0; i < 4; i++) {
if (json_store.objects[entity].state_log[i] == undefined) continue;
var slog = json_store.objects[entity].state_log[i].split("set_by=");
$('#control').find('.obj_log').append(slog[0]+"<span class='mh_set_by hidden'>set_by="+slog[1]+"</span><br>");
}

$('#control').find('.modal-body').append("<div class='obj_log'><h4>Object Log</h4>");
for (var i = 0; i < json_store.ia7_config.prefs.state_log_entries; i++) {
if (json_store.objects[entity].state_log[i] == undefined) continue;
var slog = json_store.objects[entity].state_log[i].split("set_by=");
$('#control').find('.obj_log').append(slog[0]+"<span class='mh_set_by hidden'>set_by="+slog[1]+"</span><br>");
}
}
$('.mhstatemode').on('click', function(){
$('#control').find('.states').find('.btn').removeClass('hidden');
$('#control').find('.mh_set_by').removeClass('hidden');
Expand Down Expand Up @@ -1242,4 +1307,19 @@ $(document).ready(function() {
$('#optionsModal').modal('hide');
});
});
});
});

//
// LICENSE
//
// This program is free software; you can redistribute it and/or modify it under the terms of
// the GNU General Public License as published by the Free Software Foundation;
// either version 2 of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with this program;
// if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
7 changes: 6 additions & 1 deletion web/ia7/index.shtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@
}
.toolbar-right-end {
margin-right: 15px;
}
}
.icon-larger:before
{
font-size: 46px;
margin-left: -10px;
}
</style>
</head>
<body>
Expand Down