Skip to content
Snippets Groups Projects
Commit e046b0b1 authored by George Salukvadze's avatar George Salukvadze
Browse files

v 0.41.5 

- Started development of GTT gauges component pages
- Continuing development of "tinternal" and "purity" components
- Small fixes and changes
parent 40a54228
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 186 additions and 4 deletions
app/app.config.js
+ 3
− 0
View file @ e046b0b1
......@@ -71,6 +71,9 @@ config(['$locationProvider', '$routeProvider',
when('/west', {
template: '<west></west>'
}).
when('/bottom', {
template: '<bottom></bottom>'
}).
otherwise('/');
}
]);
\ No newline at end of file
app/app.module.js
+ 2
− 1
View file @ e046b0b1
......@@ -23,5 +23,6 @@ angular.module('ng04SlowControlApp', [
'north',
'east',
'south',
'west'
'west',
'bottom'
]);
\ No newline at end of file
app/bottom/bottom.component.js 0 → 100644
+ 35
− 0
View file @ e046b0b1
'use strict';
angular.module('bottom', []).component('bottom', {
templateUrl: 'bottom/bottom.template.html',
controller: function bottomController($http, $q, $interval) {
this.pageTitle = "NP04 bottom side GTT probes";
this.natalie = 1;
this.TT0101 = "";
let self = this;
this.reload = function () {
let temp0 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_MHT0100AI");
let temp1 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_TT0100AI");
let temp2 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_PT0106AI");
let temp3 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_7TT0200AIR");
let temp4 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_7TT0202AIR");
let temp5 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_7TT0214AIR");
let temp6 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_7TT0219AIR");
let temp9 = $http.get('php-db-conn/alias.conn.timestamp.php');
$q.all([temp0, temp1, temp2, temp3, temp4, temp5, temp6, temp9]).then(function (resultArray) {
self.NP04_MHT0100AI = resultArray[0].data.records;
self.NP04_TT0100AI = resultArray[1].data.records;
self.NP04_PT0106AI = resultArray[2].data.records;
self.NP04_7TT0200AIR = resultArray[3].data.records;
self.NP04_7TT0202AIR = resultArray[4].data.records;
self.NP04_7TT0214AIR = resultArray[5].data.records;
self.NP04_7TT0219AIR = resultArray[6].data.records;
self.timestamp = resultArray[9].data.records;
console.log("interval occured");
});
};
this.reload();
$interval(this.reload, 600000);
}
});
\ No newline at end of file
app/bottom/bottom.component.spec.js 0 → 100644
+ 26
− 0
View file @ e046b0b1
describe('bottom', function() {
var $scope;
var controller;
// Load the module that contains the `phoneList` component before each test
beforeEach(function() {
module('bottom')
// Test the controller
inject(function(_$rootScope_, $controller) {
$scope = _$rootScope_.$new();
controller = $controller("bottom", {$scope: $scope});
});
describe('bottomController', function() {
it('should create a `bottom` model with 1 natalie', inject(function($componentController) {
let ctrl = $componentController('bottom');
expect(ctrl.natalie).toBe(1);
}));
})
});
;
});
\ No newline at end of file
app/bottom/bottom.module.js 0 → 100644
+ 4
− 0
View file @ e046b0b1
'use strict';
angular.module('bottom', [
'ngRoute'
]);
\ No newline at end of file
app/bottom/bottom.template.html 0 → 100644
+ 17
− 0
View file @ e046b0b1
<link rel="stylesheet" href="css/east.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/bottom1.png" alt="Bottom1"/>
<img id="detector2" src="img/bottom2.png" alt="Bottom2"/>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish * 1000 | number: 1 }} mbar</span></a></div>
<div id="tss001AABA">TSS 001 AA/BA</div>
<div id="tss002AABA">TSS 002 AA/BA</div>
<div id="tss002ADBD">TSS 002 AD/BD</div>
<div id="tss002AEBE">TSS 002 AE/BE</div>
<div id="NP04_7TT0200AIR"><a href="#!/histogram/NP04_7TT0200AIR"><span class="value">{{ $ctrl.NP04_7TT0200AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
<div id="NP04_7TT0202AIR"><a href="#!/histogram/NP04_7TT0202AIR"><span class="value">{{ $ctrl.NP04_7TT0202AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
<div id="NP04_7TT0214AIR"><a href="#!/histogram/NP04_7TT0214AIR"><span class="value">{{ $ctrl.NP04_7TT0214AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
<div id="NP04_7TT0219AIR"><a href="#!/histogram/NP04_7TT0219AIR"><span class="value">{{ $ctrl.NP04_7TT0219AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
app/css/bottom.css 0 → 100644
+ 94
− 0
View file @ e046b0b1
.container_container {
width: 100%;
height: 100%;
position: fixed;
display: inline-block;
overflow: hidden;
margin: 0;
}
#detector {
display: block;
position: fixed;
top: 25vh;
left: 2vw;
width: 35%;
}
#detector2 {
display: block;
position: fixed;
top: 25vh;
left: 42vw;
width: 35%;
}
#ambient {
position: absolute;
right: 10%;
top: 17%;
text-align: right;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
}
#tss001AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
top: 42vw;
left: 45vw;
}
#tss002AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
top: 42vw;
left: 45vw;
}
#tss002ADBD {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
top: 42vw;
left: 45vw;
}
#tss002AEBE {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
top: 42vw;
left: 45vw;
}
#NP04_7TT0200AIR {
position: fixed;
top: 42vw;
left: 61vw;
}
#NP04_7TT0202AIR {
position: fixed;
top: 42vw;
left: 61vw;
}
#NP04_7TT0214AIR {
position: fixed;
top: 42vw;
left: 61vw;
}
#NP04_7TT0219AIR {
position: fixed;
top: 42vw;
left: 61vw;
}
\ No newline at end of file
app/east/east.component.js
+ 2
− 2
View file @ e046b0b1
......@@ -11,13 +11,13 @@ angular.module('east', []).component('east', {
let temp0 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_MHT0100AI");
let temp1 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_TT0100AI");
let temp2 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_PT0106AI");
let temp3 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_7TT0214AIR");
let temp3 = $http.get("php-db-conn/alias.conn.php?elemId=NP04_7TT0206AIR");
let temp4 = $http.get('php-db-conn/alias.conn.timestamp.php');
$q.all([temp0, temp1, temp2, temp3, temp4]).then(function (resultArray) {
self.NP04_MHT0100AI = resultArray[0].data.records;
self.NP04_TT0100AI = resultArray[1].data.records;
self.NP04_PT0106AI = resultArray[2].data.records;
self.NP04_7TT0214AIR = resultArray[3].data.records;
self.NP04_7TT0206AIR = resultArray[3].data.records;
self.timestamp = resultArray[4].data.records;
console.log("interval occured");
});
......
app/east/east.template.html
+ 1
− 1
View file @ e046b0b1
......@@ -6,5 +6,5 @@
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish * 1000 | number: 1 }} mbar</span></a></div>
<div id="tss001ADBD">TSS 001 AD/BD</div>
<div id="NP04_7TT0214AIR"><a href="#!/histogram/NP04_7TT0214AIR"><span class="value">{{ $ctrl.NP04_7TT0214AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
<div id="NP04_7TT0206AIR"><a href="#!/histogram/NP04_7TT0206AIR"><span class="value">{{ $ctrl.NP04_7TT0206AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
app/index.html
+ 2
− 0
View file @ e046b0b1
......@@ -64,6 +64,8 @@
<script src="south/south.component.js"></script>
<script src="west/west.module.js"></script>
<script src="west/west.component.js"></script>
<script src="bottom/bottom.module.js"></script>
<script src="bottom/bottom.component.js"></script>
<script>
/* Set the width of the side navigation to 250px and the left margin of the page content to 250px */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment