Skip to content

Commit fdc0b4c

Browse files
committed
fixing vet errors that were breaking the build.
cleaning up header sjs
1 parent 70c5e1f commit fdc0b4c

File tree

8 files changed

+23
-28
lines changed

8 files changed

+23
-28
lines changed

examples/hr-hub/plugins/entities/Employee/conformance/conform-acme-tech/headers/headers.sjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Create Headers Plugin
2+
* Create Headers Plugin for Acme Tech data
33
*
44
* @param id - the identifier returned by the collector
55
* @param content - your final content
@@ -13,11 +13,9 @@ function createHeaders(id, content, headers, triples, options) {
1313
var latest = xs.date('1900-01-01');
1414
var salary;
1515

16-
// console.log(content);
16+
// to grab the current salary we need to find the most recent effective date
1717
for (var i = 0; i < content.salaryHistory.length; i++) {
1818
var history = content.salaryHistory[i];
19-
// console.log('history: ' + i);
20-
// console.log(history);
2119
var date = xs.date(xdmp.parseDateTime('[M01]/[D01]/[Y0001]', history.effectiveDate));
2220
if (date.gt(latest)) {
2321
salary = history.salary;

examples/hr-hub/plugins/entities/Employee/conformance/conform-global-corp/headers/headers.sjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Create Headers Plugin
2+
* Create Headers Plugin for Global Corp data
33
*
44
* @param id - the identifier returned by the collector
55
* @param content - your final content

quick-start/src/main/resources/static/app/directives/header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div class="row">
33
<div class="col-xs-6 col-sm-6 col-md-6 logo">
44
<div class="row">
5-
<div class="col-xs-11 col-sm-11 col-md-11"><img id="img_logo" src="images/logo.svg" align="left"></div>
6-
<div class="col-xs-1 col-sm-1 col-md-1"><i class="fa fa-question-circle" ng-click="showApiDoc()"></i></div>
5+
<img id="img_logo" src="images/logo.svg" align="left">
6+
<i class="fa fa-question-circle" ng-click="showApiDoc()"></i>
77
</div>
88
</div>
99
<div id="sitemenu" class="col-xs-6 col-sm-6 col-md-6 dropdown" ng-if="status != null">

quick-start/src/main/resources/static/app/directives/headerDirective.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$location.path('/login');
2424
});
2525
};
26-
26+
2727
scope.uninstall = function (ev) {
2828
var confirm = $mdDialog.confirm().title('Confirm Uninstall')
2929
.textContent('Do you really want to continue uninstalling data hub?')
@@ -48,11 +48,11 @@
4848
scope.action.type = null;
4949
});
5050
};
51-
51+
5252
scope.showApiDoc = function() {
53-
DataHub.showApiDoc();
53+
DataHub.showApiDoc();
5454
};
55-
55+
5656
}
5757
};
5858
}

quick-start/src/main/resources/static/app/quickStartApp.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
//do nothing
103103
})
104104
.when('/api-doc', {
105-
templateUrl: 'doc/apiDoc.html',
106-
controller: 'apiDocController'
105+
templateUrl: 'doc/apiDoc.html',
106+
controller: 'apiDocController'
107107
})
108108
.otherwise({
109109
redirectTo: '/login'

quick-start/src/main/resources/static/app/services/dataHubService.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@
194194
$rootScope.notificationBar.message = message;
195195
$rootScope.notificationBar.show = true;
196196
}
197-
197+
198198
function showApiDoc() {
199-
$window.open('#/api-doc', '_blank');
199+
$window.open('#/api-doc', '_blank');
200200
}
201-
201+
202202
}
203203

204204
function TaskManagerService($http, $q, $route) {

quick-start/src/main/resources/static/css/quick-start.css

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ body {
44
}
55
h1 {
66
color: #2a2d2b;
7-
font-size: 50px;
87
}
98
h2 {
109
color: #336699;
@@ -32,13 +31,8 @@ button, div#header button {
3231

3332
.btn, div#header .btn, div#content div#sidebar .btn, ul.dropdown-menu {
3433
font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
35-
font-size: 24px;
36-
margin: 2px;
37-
}
38-
.btn, div#content .btn {
39-
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
40-
font-size: 18px;
4134
}
35+
4236
div#header .alert {
4337
margin: 5px 0px;
4438
text-align: left;
@@ -143,7 +137,7 @@ div.button-group-right {
143137
}
144138
.fa {
145139
margin-right: 10px;
146-
font-size: 36px;
140+
font-size: 24px;
147141
}
148142
li.folder, li.file {
149143
list-style: none;
@@ -280,4 +274,7 @@ div.api-doc > div {
280274
padding: 15px;
281275
}
282276

283-
277+
#img_logo {
278+
margin: 0pt 10px;
279+
height: 50px;
280+
}

quick-start/src/main/resources/static/doc/apiDocController.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
angular.module('dhib.quickstart.controller.api.doc', dependencies)
88
.controller('apiDocController', ApiDocController);
99

10-
function ApiDocController($scope) {
11-
10+
function ApiDocController($scope, $window) {
11+
1212
$scope.loading = false;
1313
$scope.url = $scope.swaggerUrl = 'v2/api-docs';
1414
$scope.myErrorHandler = function (data, status) {
15-
alert('Failed to load swagger: ' + status + ' ' + data);
15+
$window.alert('Failed to load swagger: ' + status + ' ' + data);
1616
};
1717
$scope.infos = false;
1818
}

0 commit comments

Comments
 (0)