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

v 0.41.3

- Started development of GTT gauges component pages
- Continuing development of "tinternal" and "purity" components
- Small fixes and changes
parent 1900f64e
No related branches found
No related tags found
No related merge requests found
......@@ -68,6 +68,9 @@ config(['$locationProvider', '$routeProvider',
when('/south', {
tempalte: '<south></south>'
}).
when('/west', {
template: '<west></west>'
}).
otherwise('/');
}
]);
\ No newline at end of file
......@@ -22,5 +22,6 @@ angular.module('ng04SlowControlApp', [
'tinternal',
'north',
'east',
'south'
'south',
'west'
]);
\ No newline at end of file
.container_container {
width: 100%;
height: 100%;
position: fixed;
display: inline-block;
overflow: hidden;
margin: 0;
}
#detector {
display: block;
position: fixed;
top: 25vh;
left: 12vw;
width: 65%;
}
#ambient {
position: absolute;
right: 10%;
top: 17%;
text-align: right;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
}
#tss001ACBC {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
top: 42vw;
left: 45vw;
}
#NP04_7TT0212AIR {
position: fixed;
top: 42vw;
left: 61vw;
}
\ No newline at end of file
.container_container {
width: 100%;
height: 100%;
position: fixed;
display: inline-block;
overflow: hidden;
margin: 0;
}
#detector {
display: block;
position: fixed;
top: 25vh;
left: 12vw;
width: 65%;
}
#ambient {
position: absolute;
right: 10%;
top: 17%;
text-align: right;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
}
#tss001AEBE {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.7vmin;
top: 42vw;
left: 45vw;
}
#NP04_7TT0218AIR {
position: fixed;
top: 42vw;
left: 61vw;
}
\ No newline at end of file
......@@ -62,6 +62,8 @@
<script src="east/east.component.js"></script>
<script src="south/south.module.js"></script>
<script src="south/south.component.js"></script>
<script src="west/west.module.js"></script>
<script src="west/west.component.js"></script>
<script>
/* Set the width of the side navigation to 250px and the left margin of the page content to 250px */
......
<link rel="stylesheet" href="css/east.css">
<link rel="stylesheet" href="css/south.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001acbc.png" alt="TSS 001 AB/BB"/>
......
'use strict';
angular.module('west', []).component('west', {
templateUrl: 'west/west.template.html',
controller: function westController($http, $q, $interval) {
this.pageTitle = "NP04 west 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_7TT0218AIR");
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_7TT0218AIR = resultArray[3].data.records;
self.timestamp = resultArray[4].data.records;
console.log("interval occured");
});
};
this.reload();
$interval(this.reload, 600000);
}
});
\ No newline at end of file
describe('west', function() {
var $scope;
var controller;
// Load the module that contains the `phoneList` component before each test
beforeEach(function() {
module('west')
// Test the controller
inject(function(_$rootScope_, $controller) {
$scope = _$rootScope_.$new();
controller = $controller("west", {$scope: $scope});
});
describe('westController', function() {
it('should create a `west` model with 1 natalie', inject(function($componentController) {
let ctrl = $componentController('west');
expect(ctrl.natalie).toBe(1);
}));
})
});
;
});
\ No newline at end of file
'use strict';
angular.module('west', [
'ngRoute'
]);
\ No newline at end of file
<link rel="stylesheet" href="css/south.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001acbc.png" alt="TSS 001 AB/BB"/>
<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="tss001AEBE">TSS 001 AE/BE</div>
<div id="NP04_7TT0218AIR"><a href="#!/histogram/NP04_7TT0218AIR"><span class="value">{{ $ctrl.NP04_7TT0218AIR[0].Mnish | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment