Skip to content

Commit

Permalink
Merge pull request SoftwareDefinedBuildings#30 from rajasriramoju/26-…
Browse files Browse the repository at this point in the history 
…additions

26 additions
  • Loading branch information
@rajasriramoju
rajasriramoju authored May 20, 2019
2 parents 9d7577b + 833587c commit a0a8339
Show file tree
Hide file tree
Showing 14 changed files with 375 additions and 131 deletions.
68 changes: 49 additions & 19 deletions dashboards/solarplus-ui/static/assets/css/materialize.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
.preloader {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #0E1E2F;
z-index: 9999;
display: flex;
align-items: center;
justify-content: center;
}

::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
color: white;
opacity: 1; /* Firefox */
}

:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: white;
}

::-ms-input-placeholder { /* Microsoft Edge */
color: white;
}

.dashe-blue{
background-color: #2d3b6a;
Expand Down Expand Up @@ -2794,11 +2818,12 @@ a {
width: 15px;
height: 15px;
margin-top: 165%;
margin-right: 100%;
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
/* margin-right: 100%;
padding-right: 50%; */
/* -webkit-border-radius: 25px;
-moz-border-radius: 25px; */
border-radius: 25px;
background: red;
background-color: red;

}

Expand All @@ -2811,6 +2836,12 @@ a {

}

#intelligence-control-on-off{


/*font-family: sans-serif;*/
}

.hoverable {
-webkit-transition: -webkit-box-shadow .25s;
transition: -webkit-box-shadow .25s;
Expand Down Expand Up @@ -3060,6 +3091,19 @@ ul.staggered-list li {
.hide-on-med-and-down {
display: none !important;
}
#intelligent-control {
width: 15px;
height: 15px;
/* margin-top: 165%; */
/* margin-right: 100%;
padding-right: 50%; */
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
border-radius: 25px;
background-color: red;

}

}

@media only screen and (min-width: 601px) {
Expand Down Expand Up @@ -6402,21 +6446,7 @@ label {
color: #9e9e9e;
}

/* Text Inputs + Textarea
========================================================================== */
/* Style Placeholders */
::-webkit-input-placeholder {
color: #d1d1d1;
}
::-moz-placeholder {
color: #d1d1d1;
}
:-ms-input-placeholder {
color: #d1d1d1;
}
::placeholder {
color: gray;
}


/* Text inputs */
input:not([type]),
Expand Down
Binary file added dashboards/solarplus-ui/static/assets/img/preloader.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions dashboards/solarplus-ui/static/assets/js/intelligence/intelligence.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
$(document).ready(function() {
var intelligenceText = sessionStorage.getItem('text');
var intelligenceColor = sessionStorage.getItem('color');
if(intelligenceText == 'on') {
console.log('inside on')
document.getElementById("check").checked = true;
document.getElementById("intelligence-control-on-off").innerText = "Intelligent Control On"
document.getElementById("intelligent-control").style.backgroundColor = "green"
}
if(intelligenceText == 'off'){
console.log('inside')
document.getElementById("check").checked = false;
document.getElementById("intelligence-control-on-off").innerText = "Intelligent Control Off"
document.getElementById("intelligent-control").style.backgroundColor = "red"
}
$("input").change(function(){
if($(this).is(":checked")){
console.log("Is checked");
sessionStorage.setItem('text','on');
sessionStorage.setItem('color','on');
document.getElementById("intelligence-control-on-off").innerText = "Intelligent Control On"
document.getElementById("intelligent-control").style.backgroundColor = "green"
}
else{
console.log("Is Not Checked");
sessionStorage.setItem('text','off');
sessionStorage.setItem('color','off');
document.getElementById("intelligence-control-on-off").innerText = "Intelligent Control Off"
document.getElementById("intelligent-control").style.backgroundColor = "red"
}
})
})
17 changes: 17 additions & 0 deletions dashboards/solarplus-ui/static/assets/js/navbar.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$(document).ready(function () {
$('.sidenav').sidenav();
var intelligenceText = sessionStorage.getItem('text');
var intelligenceColor = sessionStorage.getItem('color');
console.log(intelligenceColor);
console.log(intelligenceText);
if((intelligenceText == 'on') && (intelligenceColor == 'on')) {
console.log('inside on')
document.getElementById("intelligence-control-on-off").innerText = "Intelligent Control On"
document.getElementById("intelligent-control").style.backgroundColor = "green"
}
if((intelligenceText == 'off') && (intelligenceColor == 'off')) {
console.log('inside off')
document.getElementById("intelligence-control-on-off").innerText = "Intelligent Control Off"
document.getElementById("intelligent-control").style.backgroundColor = "red"
}
})
8 changes: 8 additions & 0 deletions dashboards/solarplus-ui/static/assets/js/preloader.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
(function ($) {
'use strict';
// Preloader js
$(window).on('load', function () {
$('.preloader').fadeOut(700);
});

})(jQuery);
27 changes: 24 additions & 3 deletions dashboards/solarplus-ui/static/assets/js/schedule/schedule-epochs.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$(document).ready(function() {
M.AutoInit();
console.log(sessionStorage.getItem("modesToGroup"));

let c = ["pink", "deep-orange", "green", "teal", "blue", "deep-purple", "tp-blue"];
let pipvals = ["12am", "2am", "4am", "6am", "8am", "10am", "12pm", "2pm", "4pm", "6pm", "8pm", "10pm", "12am"];
let piprev = ["12am", "10pm", "8pm", "6pm", "4pm", "2pm", "12pm", "10am", "8am", "6am", "4am", "2am", "12am"];
Expand Down Expand Up @@ -104,21 +104,37 @@ $(document).ready(function() {
if (row == 0) { var col = i; } else { var col = i - sum + counts[row]; }
if (!edit) {
if (sliderColors[row][col] == curColor) {
console.log("here")
$(this).css("background", "#CCC");
sliderColors[row][col] = "#CCC";
sliderModes[row][col] = null;


} else {
console.log("here2")
$(this).css("background", curColor);
sliderColors[row][col] = curColor;
sliderModes[row][col] = curMode;
}
console.log(sliderColors);
sessionStorage.setItem('slider',JSON.stringify(sliderColors[0]));
var temp = sessionStorage.getItem('slider');
var temp2 = JSON.parse(temp);
console.log(temp2);
console.log(sliderColors[0][0]);
}
console.log(row, col);
});
});
} getConnect();

var temp = sessionStorage.getItem('slider');
var temp2 = JSON.parse(temp);
console.log(temp2);
console.log(sliderColors[0].length)
for(let i = 0;i<sliderColors[0].length;i++){
sliderColors[0][i] = temp2[i]
}

var location;
function readIn() {
// location = "Basketball Courts";
Expand All @@ -137,7 +153,12 @@ $(document).ready(function() {
arr.push(obj.times);
var sets = new Object();
sets.Time = sliderModes[0];

console.log(sliderModes[0]);
// sessionStorage.setItem('slider',JSON.stringify(sliderColors[0]));
// var temp = sessionStorage.getItem('slider');
// var temp2 = JSON.parse(temp);
// console.log(temp2);
// console.log(sliderColors[0].length)
obj.settings = sets;
arr.push(obj.settings);
console.log(arr);
Expand Down
37 changes: 34 additions & 3 deletions dashboards/solarplus-ui/static/assets/js/schedule/schedule-groupings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ $(document).ready(function() {
M.AutoInit();
var zoneSel = 0;
var zoneArr = [];

document.getElementById('temp1').value = sessionStorage.getItem('tempOne');
document.getElementById('temp2').value = sessionStorage.getItem('tempTwo');
document.getElementById('temp3').value = sessionStorage.getItem('tempThree');
document.getElementById('temp4').value = sessionStorage.getItem('tempFour');

document.getElementById('temp5').value = sessionStorage.getItem('tempFive');
document.getElementById('temp6').value = sessionStorage.getItem('tempSix');
document.getElementById('temp7').value = sessionStorage.getItem('tempSeven');
document.getElementById('temp8').value = sessionStorage.getItem('tempEight');

$(".filled-in").each(function() {
$(this).click(function() {
var t = $(this).find("span").prevObject["0"]["labels"][0]["innerText"];
Expand Down Expand Up @@ -72,8 +83,20 @@ $(document).ready(function() {
modes.push(m);
});
M.toast({html: 'Current setpoints successfully updated.', classes:"rounded", displayLength: 2000});

console.log(modes);
var temp1 = document.getElementById('temp1').value;
var temp2 = document.getElementById('temp2').value;
var temp3 = document.getElementById('temp3').value;
var temp4 = document.getElementById('temp4').value;

sessionStorage.setItem('tempOne',temp1);
sessionStorage.setItem('tempTwo',temp2);
sessionStorage.setItem('tempThree',temp3);
sessionStorage.setItem('tempFour',temp4);
// console.log(temp1);
// console.log(temp2);
// console.log(temp3);
// console.log(temp4);
// console.log(temp);

var result, ctr, keys, columnDelimiter, lineDelimiter, data, csv, eCSV;
data = modes;
Expand Down Expand Up @@ -125,8 +148,16 @@ $(document).ready(function() {
modes.push(m);
});
M.toast({html: 'Current setpoints successfully updated.', classes:"rounded", displayLength: 2000});
var temp5 = document.getElementById('temp5').value;
var temp6 = document.getElementById('temp6').value;
var temp7 = document.getElementById('temp7').value;
var temp8 = document.getElementById('temp8').value;

sessionStorage.setItem('tempFive',temp5);
sessionStorage.setItem('tempSix',temp6);
sessionStorage.setItem('tempSeven',temp7);
sessionStorage.setItem('tempEight',temp8);

console.log(modes);

var result, ctr, keys, columnDelimiter, lineDelimiter, data, csv, eCSV;
data = modes;
Expand Down
72 changes: 44 additions & 28 deletions dashboards/solarplus-ui/templates/contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,49 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='assets/css/contact-form.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='assets/css/materialize.css') }}">
<link rel="stylesheet" type="text/css" media="screen" href="{{ url_for('static', filename='assets/css/particles.css') }}">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/preloader.js') }}"></script>
<link rel="stylesheet" type="text/css" media="screen"
href="{{ url_for('static', filename='assets/css/particles.css') }}">
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
</head>

<body id="body" class="">
<div id="particles-js"></div>
<div class="">
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/index" class="brand-logo">SolarPlus</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<div id="intelligent-control-text">
<h6>Intelligent Control off</h6>
</div>
</li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<!-- <li><a href="/DR">DR</a></li> -->
<li><a href="/intelligence">Intelligence</a></li>
<li class="active"><a href="#">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
</div>
</nav>
</div>
<div class="preloader">
<img src="{{ url_for('static', filename='assets/img/preloader.gif') }}" alt="preloader">
</div>
<div id="particles-js"></div>
<div class="">
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/index" class="brand-logo">SolarPlus</a>
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<a id="intelligence-control-on-off">Intelligent Control off</a>
</li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<!-- <li><a href="/DR">DR</a></li> -->
<li><a href="/intelligence">Intelligence</a></li>
<li class="active"><a href="#">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<ul class="sidenav" id="mobile-demo">
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
</div>
</nav>
</div>



Expand All @@ -51,7 +64,8 @@ <h6>Intelligent Control off</h6>
<form class="form-animated">
<input type="text" class="field-in white-text" id="contact-font" placeholder="Your Name" />

<input type="text" class="fieldemail-contact field-in white-text" id="contact-font" placeholder="webdevwizards193@gmail.com" />
<input type="text" class="fieldemail-contact field-in white-text" id="contact-font"
placeholder="webdevwizards193@gmail.com" />

<input type="text" class="fieldphone-contact field-in white-text" id="contact-font" placeholder="Phone" />

Expand Down Expand Up @@ -83,8 +97,10 @@ <h6>Intelligent Control off</h6>

<script type="text/javascript" src="{{url_for('static', filename='assets/js/logout.js') }}"></script>
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.451.0.min.js"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/lib/materialize.js') }}"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/lib/jquery.js') }}"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/lib/materialize.js') }}"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/particles.js') }}"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/app.js') }}"></script>
<script type="text/javascript" src="{{url_for('static', filename='assets/js/navbar.js') }}"></script>

</html>
Loading

0 comments on commit a0a8339

Please sign in to comment.