This commit is contained in:
Senad Uka
2016-11-19 08:34:48 +01:00
parent d17fd8f940
commit d5d4ba872d
4 changed files with 36 additions and 8 deletions

View File

@@ -1,5 +1,7 @@
package com.zoblak.farmalarm; package com.zoblak.farmalarm;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -28,7 +30,9 @@ public class MainScreenFragment extends Fragment {
WebSettings webSettings = webView.getSettings(); WebSettings webSettings = webView.getSettings();
webSettings.setJavaScriptEnabled(true); webSettings.setJavaScriptEnabled(true);
webSettings.setDomStorageEnabled(true); webSettings.setDomStorageEnabled(true);
webView.loadUrl("http://agrar.zoblak.com/alarm"); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getContext());
String controllers = prefs.getString("controllers", "");
webView.loadUrl("http://agrar.zoblak.com/alarm?controller_id=" + controllers);
return view; return view;
} }

View File

@@ -4,6 +4,7 @@
<div class="jumbotron text-center center-block" > <div class="jumbotron text-center center-block" >
{{#with state}} {{#with state}}
{{#if alarmTriggered}} {{#if alarmTriggered}}
<div>{{ pretty_reason alarmReasons }}</div>
<img src="/images/alarm.gif" class="img-responsive center-block" id="alarm_image" /> <img src="/images/alarm.gif" class="img-responsive center-block" id="alarm_image" />
<button id="stop_alarm" class="btn btn-danger"> <i class="fa fa-ban"></i> Prekini </button> <button id="stop_alarm" class="btn btn-danger"> <i class="fa fa-ban"></i> Prekini </button>
{{/if}} {{/if}}

View File

@@ -39,6 +39,22 @@ Template.alarm.helpers({
result += '' + parseFloat(temperatures[i]).toFixed(1) + ' °C '; result += '' + parseFloat(temperatures[i]).toFixed(1) + ' °C ';
} }
return result; return result;
},
pretty_reasons: function(reasons) {
var results = "";
if(reasons.tooHot) {
results += "Temperatura previsoka!";
}
if(reasons.tooCold) {
results += "Temperatura preniska!";
}
if(reasons.phoneSilent) {
results += "Mobitel nedostupan! Provjerite internet!";
}
if(reasons.boxSilent) {
results += "Zoblak kutija se ne javlja! Provjerite internet!";
}
return results;
} }
}); });

View File

@@ -17,30 +17,37 @@ Template.tabs.helpers({
}, },
selected_controller: function() { selected_controller: function() {
return Session.get('controller_id'); return
}, },
accessible: Meteor.zoblak.client.accessible accessible: Meteor.zoblak.client.accessible
}); });
function saveParamsAndGo(where) {
var hideControllerSelection = Session.get('hide_controller_selection');
if (hideControllerSelection) {
Router.go(where + "?controller_id=" + Session.get('controller_id'));
} else {
Router.go(where);
}
}
Template.tabs.events({ Template.tabs.events({
'click .start': function() { 'click .start': function() {
Router.go('/'); saveParamsAndGo('/');
}, },
'click .weather': function() { 'click .weather': function() {
Router.go('/weather'); saveParamsAndGo('/weather');
}, },
'click .log': function() { 'click .log': function() {
Router.go('/log'); saveParamsAndGo('/log');
}, },
'click .surveillance': function() { 'click .surveillance': function() {
Router.go('/surveillance'); saveParamsAndGo('/surveillance');
}, },
'click .alarm': function() { 'click .alarm': function() {
Router.go('/alarm'); saveParamsAndGo('/alarm');
}, },
'click .settings': function() { 'click .settings': function() {
Session.set('templateName', 'settings'); Session.set('templateName', 'settings');