Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fe1c94b

Browse files
Single
1 parent e983f66 commit fe1c94b

File tree

5 files changed

+83
-87
lines changed

5 files changed

+83
-87
lines changed

‎Web/SinglePageAngularJS/controller/dashboardController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
app.controller('dashboardCtr', function($scope,$mdDialog) {
22

3-
console.log("dashboard");
3+
//console.log("dashboard");
44

55
$scope.showAdvanced = function(presentData) {
66
console.log(presentData);

‎Web/SinglePageAngularJS/controller/homeController.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ app.controller('homeCtr', function($scope, $mdSidenav, readJsonData, $state, $md
4141
$scope.getData = readJsonData.getJson();
4242
$scope.getData.then(function(response) {
4343
$scope.data = response;
44-
console.log($scope.data);
44+
//console.log($scope.data);
4545
})
4646

47-
$rootScope.uniqueManufacturer = [];
47+
$scope.uniqueManufacturer = [];
4848
$scope.uniqueStorage = [];
49-
varuniqueOS = [];
50-
varuniqueCamera = [];
49+
$scope.uniqueOS = [];
50+
$scope.uniqueCamera = [];
5151

5252
$scope.printManufacturer = function(id,data){
5353
var index;
@@ -57,7 +57,7 @@ app.controller('homeCtr', function($scope, $mdSidenav, readJsonData, $state, $md
5757
value = data[i].specs[m];
5858

5959
index = $scope.uniqueManufacturer.indexOf(id);
60-
console.log(index);
60+
//console.log(index);
6161
if(index>-1){
6262
$scope.uniqueManufacturer.splice(index,1);
6363
break;
@@ -79,7 +79,7 @@ $scope.printStorage = function(id,data){
7979
value = data[i].specs[m];
8080

8181
index = $scope.uniqueStorage.indexOf(id);
82-
console.log(index);
82+
//console.log(index);
8383
if(index>-1){
8484
$scope.uniqueStorage.splice(index,1);
8585
break;
@@ -100,19 +100,19 @@ $scope.printOS = function(id,data){
100100
for (var i = 0; i < data.length; i++) {
101101
value = data[i].specs[m];
102102

103-
index = uniqueOS.indexOf(id);
104-
console.log(index);
103+
index = $scope.uniqueOS.indexOf(id);
104+
//console.log(index);
105105
if(index>-1){
106-
uniqueOS.splice(index,1);
106+
$scope.uniqueOS.splice(index,1);
107107
break;
108108
}
109109
else {
110-
uniqueOS.push(id);
110+
$scope.uniqueOS.push(id);
111111
break;
112112
}
113-
console.log(value);
113+
//console.log(value);
114114
}
115-
console.log(uniqueOS);
115+
//console.log($scope.uniqueOS);
116116
}
117117

118118
$scope.printCamera = function(id,data){
@@ -122,19 +122,19 @@ $scope.printCamera = function(id,data){
122122
for (var i = 0; i < data.length; i++) {
123123
value = data[i].specs[m];
124124

125-
index = uniqueCamera.indexOf(id);
126-
console.log(index);
125+
index = $scope.uniqueCamera.indexOf(id);
126+
//console.log(index);
127127
if(index>-1){
128-
uniqueCamera.splice(index,1);
128+
$scope.uniqueCamera.splice(index,1);
129129
break;
130130
}
131131
else {
132-
uniqueCamera.push(id);
132+
$scope.uniqueCamera.push(id);
133133
break;
134134
}
135-
console.log(value);
135+
//console.log(value);
136136
}
137-
console.log(uniqueCamera);
137+
//console.log($scope.uniqueCamera);
138138
}
139139

140140
// $scope.exists = function(id){
Lines changed: 58 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,76 @@
11
app.filter('filterDashboard',function(){
2-
return function(item,detail,storage){
3-
//console.log(detail);
4-
//console.log(item);
5-
//console.log(storage);
2+
return function(item,maker,storage,operating,camera){
3+
64
var sortedHai = [];
5+
var array = [];
76
var values;
87
var company;
98
var memory;
109
var index;
1110
var count=0;
12-
if(item!=undefined){
13-
for (var i = 0; i < item.length; i++) {
14-
values = item[i];
1511

16-
//console.log(values);
17-
if (detail!=undefined) {
18-
for (var j = 0; j < detail.length; j++) {
19-
company = detail[j];
20-
//console.log(select);
21-
if(company == item[i].specs.manufacturer){
22-
//index = sortedHai.indexOf(values);
23-
//if(index==-1){
24-
sortedHai.push(values);
25-
count++;
26-
//}
12+
if(maker.length!=0 || storage.length!=0 || operating.length!=0 || camera.length!=0){
13+
// console.log(maker);
14+
// console.log(storage);
15+
// console.log(operating);
16+
// console.log(camera);
17+
if (maker.length!=0) {
18+
//console.log(maker);
19+
for (var i = 0; i < item.length; i++) {
20+
for (var j = 0; j < maker.length; j++) {
21+
if(maker[j]==item[i].specs.manufacturer){
22+
//console.log(maker);
23+
sortedHai.push(item[i]);
24+
}
25+
}
2726
}
27+
//console.log(sortedHai);
28+
}
29+
else {
30+
sortedHai = item;
2831
}
29-
}
30-
if (count>0) {
31-
32-
if(storage!=undefined){
33-
for (var k = 0; k < sortedHai.length; k++) {
34-
memory = sortedHai[k];
35-
//console.log(memory);
36-
if(storage == sortedHai[k].specs.storage){
37-
index = sortedHai.indexOf();
38-
console.log(sortedHai);
39-
console.log(index);
40-
// if (index == -1) {
41-
// sortedHai.push(values);
42-
// count++;
43-
// }
44-
if(index>-1){
45-
sortedHai.splice(index,1);
46-
count++;
47-
break;
4832

33+
if (storage.length!=0) {
34+
for (var i = 0; i < sortedHai.length; i++) {
35+
for (var j = 0; j < storage.length; j++) {
36+
if(storage[j]==sortedHai[i].specs.storage){
37+
array.push(sortedHai[i]);
38+
}
39+
}
40+
}
41+
sortedHai = array;
42+
array = [];
4943
}
50-
else {
51-
sortedHai.push(memory);
52-
count++;
53-
break;
5444

45+
if (operating.length!=0) {
46+
for (var i = 0; i < sortedHai.length; i++) {
47+
for (var j = 0; j < operating.length; j++) {
48+
if (operating[j]==sortedHai[i].specs.os) {
49+
array.push(sortedHai[i]);
50+
}
51+
}
52+
}
53+
sortedHai = array;
54+
array = [];
5555
}
5656

57-
}
57+
if (camera.length!=0) {
58+
for (var i = 0; i < sortedHai.length; i++) {
59+
for (var j = 0; j < camera.length; j++) {
60+
if (camera[j]==sortedHai[i].specs.camera) {
61+
array.push(sortedHai[i]);
62+
}
63+
}
64+
}
65+
sortedHai = array;
66+
array = [];
67+
}
68+
return sortedHai;
69+
}
70+
//console.log(sortedHai);
71+
else {
72+
return item;
5873
}
5974

6075
}
61-
}
62-
}
63-
}
64-
65-
66-
67-
if(count>0){
68-
return sortedHai;
69-
}
70-
else {
71-
//sortedHai = item;
72-
return item;
73-
}
74-
//console.log(sortedHai);
75-
76-
}
77-
78-
}
79-
80-
)
76+
})

‎Web/SinglePageAngularJS/templates/dashboard.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div layout="row" layout-wrap >
2-
<md-card ng-repeat="file in values=(data | filterDashboard:uniqueManufacturer:uniqueStorage) " class="card" flex-gt-sm="30" ng-controller="dashboardCtr">
2+
<md-card ng-repeat="file in values=(data | filterDashboard:uniqueManufacturer:uniqueStorage:uniqueOS:uniqueCamera) " class="card" flex-gt-sm="30" ng-controller="dashboardCtr">
33
<md-card-title>
44
<md-card-title-text>
55
<p style="font-weight:bold ">{{file.name}}</p>

‎Web/SinglePageAngularJS/templates/sidenav.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<section>
44

5-
<md-sidenav class="md-sidenav-left side" md-component-id="left" id="hideSideBar" md-disable-backdrop style="position: fixed;" >
5+
<md-sidenav class="md-sidenav-left side" md-component-id="left" id="hideSideBar" md-disable-backdrop style="position: fixed;" >
66

77
<md-content>
88

99
<md-subheader class="md-no-sticky">Manufacturer</md-subheader>
1010
<md-list-item ng-repeat="display in data | removeDuplicate:'manufacturer'">
1111
<p> {{ display }} </p>
12-
<md-checkbox class="md-secondary" ng-click="printManufacturer(display,data)"></md-checkbox>
12+
<md-checkbox aria-label="Manufacturer" class="md-secondary" ng-click="printManufacturer(display,data)"></md-checkbox>
1313

1414
</md-list-item>
1515

@@ -18,23 +18,23 @@
1818
<md-subheader class="md-no-sticky">Storage</md-subheader>
1919
<md-list-item ng-repeat="display in data | removeDuplicate:'storage'">
2020
<p> {{ display }} </p>
21-
<md-checkbox class="md-secondary" ng-click="printStorage(display,data)"></md-checkbox>
21+
<md-checkbox aria-label="Storage" class="md-secondary" ng-click="printStorage(display,data)"></md-checkbox>
2222
</md-list-item>
2323

2424
<md-divider></md-divider>
2525

2626
<md-subheader class="md-no-sticky">OS</md-subheader>
2727
<md-list-item ng-repeat="display in data | removeDuplicate:'os'">
2828
<p> {{ display }} </p>
29-
<md-checkbox class="md-secondary" ng-click="printOS(display,data)"></md-checkbox>
29+
<md-checkbox aria-label="OS" class="md-secondary" ng-click="printOS(display,data)"></md-checkbox>
3030
</md-list-item>
3131

3232
<md-divider></md-divider>
3333

3434
<md-subheader class="md-no-sticky">Camera</md-subheader>
3535
<md-list-item ng-repeat="display in data | removeDuplicate:'camera'">
3636
<p> {{ display }} </p>
37-
<md-checkbox class="md-secondary" ng-click="printCamera(display,data)"></md-checkbox>
37+
<md-checkbox aria-label="Camera" class="md-secondary" ng-click="printCamera(display,data)"></md-checkbox>
3838
</md-list-item>
3939

4040
<md-divider></md-divider>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /