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 fa7cbcc

Browse files
Single
1 parent 3916a48 commit fa7cbcc

File tree

9 files changed

+227
-41
lines changed

9 files changed

+227
-41
lines changed
2.79 KB
Loading[フレーム]

‎Web/SinglePageAngularJS/controller/dashboardController.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,26 @@ app.controller('dashboardCtr', function($scope,$mdDialog) {
22

33
console.log("dashboard");
44

5-
$scope.showAdvanced = function(ev,presentData) {
5+
$scope.showAdvanced = function(presentData) {
66
console.log(presentData);
77
$mdDialog.show({
8+
controller: 'dialogCtr',
89
templateUrl: 'templates/popup.html',
910
parent: angular.element(document.body),
10-
targetEvent: ev,
11-
clickOutsideToClose:true
11+
//targetEvent: ev,
12+
clickOutsideToClose:true,
13+
locals:{
14+
phoneData: presentData
15+
}
1216
})}
1317

1418
$scope.cancel = function() {
1519
$mdDialog.cancel();
1620
}
1721

18-
function dialogCtr($scope, $mdDialog, info) {
19-
// Assigned from construction <code>locals</code> options...
20-
$scope.info = info;
21-
}
22-
2322
});
23+
app.controller('dialogCtr',function ($scope, $mdDialog, locals) {
24+
// Assigned from construction <code>locals</code> options...
25+
$scope.locals = locals.phoneData;
26+
console.log(locals);
27+
})

‎Web/SinglePageAngularJS/controller/homeController.js‎

Lines changed: 123 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,35 @@
1-
app.controller('homeCtr', function($scope, $mdSidenav, readJsonData, $state, $mdDialog) {
2-
$scope.consoleDisplay = function() {
3-
console.log($scope.user);
4-
console.log($scope.pass);
5-
}
1+
app.controller('homeCtr', function($scope, $mdSidenav, readJsonData, $state, $mdDialog,$rootScope) {
2+
// $scope.consoleDisplay = function() {
3+
// console.log($scope.user);
4+
// console.log($scope.pass);
5+
// }
66

77
$scope.toggleLeft = buildToggler('left');
8-
98
function buildToggler(id) {
109
return function() {
1110
$mdSidenav(id).toggle();
11+
}
1212
}
13-
}
13+
14+
$scope.fileData = function(){
15+
console.log($scope.display);
16+
}
17+
18+
// $scope.toggleLeft = buildToggler('hideSideBar');
19+
// function buildToggler(id) {
20+
// return function(){
21+
// var e = document.getElementById(id);
22+
// console.log(e.style.display);
23+
// if(e.style.display == 'none' || e.style.display == ''){
24+
// e.classList.remove("md-closed");
25+
// e.style.display = 'block';
26+
// }else{
27+
// e.classList.add("md-closed");
28+
// e.style.display = 'none';
29+
// }
30+
// }
31+
// }
32+
1433
// function buildToggler(componentId){
1534
// if (!hidden) {
1635
// jq('#hideme').addClass('hidden');
@@ -25,16 +44,103 @@ app.controller('homeCtr', function($scope, $mdSidenav, readJsonData, $state, $md
2544
console.log($scope.data);
2645
})
2746

28-
$state.go('home.dashboard');
47+
$rootScope.uniqueManufacturer = [];
48+
$scope.uniqueStorage = [];
49+
var uniqueOS = [];
50+
var uniqueCamera = [];
51+
52+
$scope.printManufacturer = function(id,data){
53+
var index;
54+
var value;
55+
var m = 'manufacturer';
56+
for (var i = 0; i < data.length; i++) {
57+
value = data[i].specs[m];
58+
59+
index = $scope.uniqueManufacturer.indexOf(id);
60+
console.log(index);
61+
if(index>-1){
62+
$scope.uniqueManufacturer.splice(index,1);
63+
break;
64+
}
65+
else {
66+
$scope.uniqueManufacturer.push(id);
67+
break;
68+
}
69+
//console.log(value);
70+
}
71+
// console.log($scope.uniqueManufacturer);
72+
}
73+
74+
$scope.printStorage = function(id,data){
75+
var index;
76+
var value;
77+
var m = 'storage';
78+
for (var i = 0; i < data.length; i++) {
79+
value = data[i].specs[m];
80+
81+
index = $scope.uniqueStorage.indexOf(id);
82+
console.log(index);
83+
if(index>-1){
84+
$scope.uniqueStorage.splice(index,1);
85+
break;
86+
}
87+
else {
88+
$scope.uniqueStorage.push(id);
89+
break;
90+
}
91+
//console.log(value);
92+
}
93+
//console.log($scope.uniqueStorage);
94+
}
2995

96+
$scope.printOS = function(id,data){
97+
var index;
98+
var value;
99+
var m = 'os';
100+
for (var i = 0; i < data.length; i++) {
101+
value = data[i].specs[m];
102+
103+
index = uniqueOS.indexOf(id);
104+
console.log(index);
105+
if(index>-1){
106+
uniqueOS.splice(index,1);
107+
break;
108+
}
109+
else {
110+
uniqueOS.push(id);
111+
break;
112+
}
113+
console.log(value);
114+
}
115+
console.log(uniqueOS);
116+
}
117+
118+
$scope.printCamera = function(id,data){
119+
var index;
120+
var value;
121+
var m = 'camera';
122+
for (var i = 0; i < data.length; i++) {
123+
value = data[i].specs[m];
124+
125+
index = uniqueCamera.indexOf(id);
126+
console.log(index);
127+
if(index>-1){
128+
uniqueCamera.splice(index,1);
129+
break;
130+
}
131+
else {
132+
uniqueCamera.push(id);
133+
break;
134+
}
135+
console.log(value);
136+
}
137+
console.log(uniqueCamera);
138+
}
139+
140+
// $scope.exists = function(id){
141+
// return uniqueManufacturer.indexOf(id) > -1;
142+
// }
143+
144+
$state.go('home.dashboard');
30145

31146
});
32-
// var e = document.getElementById(id);
33-
// console.log(e.style.display);
34-
// if(e.style.display == 'none' || e.style.display == ''){
35-
// e.classList.remove("md-closed");
36-
// e.style.display = 'block';
37-
// }else{
38-
// e.classList.add("md-closed");
39-
// e.style.display = 'none';
40-
// }
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
app.controller('sidenav',function($scope){
2+
console.log("Side");
3+
$scope.print = function(id){
4+
console.log(id);
5+
}
6+
})
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
app.filter('filterDashboard',function(){
2+
return function(item,detail,storage){
3+
console.log(detail);
4+
console.log(item);
5+
//console.log(storage);
6+
var sortedHai = [];
7+
var values;
8+
var company;
9+
var memory;
10+
var index;
11+
var count=0;
12+
if(item!=undefined){
13+
for (var i = 0; i < item.length; i++) {
14+
values = item[i];
15+
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+
//}
27+
}
28+
}
29+
}
30+
if(storage!=undefined){
31+
for (var k = 0; k < storage.length; k++) {
32+
memory = storage[k];
33+
//console.log(memory);
34+
if(memory == item[i].specs.storage){
35+
//index = sortedHai.indexOf()
36+
sortedHai.push(values);
37+
count++;
38+
}
39+
}
40+
41+
}
42+
}
43+
}
44+
if(count>0){
45+
return sortedHai;
46+
}
47+
else {
48+
//sortedHai = item;
49+
return item;
50+
}
51+
//console.log(sortedHai);
52+
53+
}
54+
55+
}
56+
57+
)

‎Web/SinglePageAngularJS/index.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@
3030
<script src="service/readJson.js" charset="utf-8"></script>
3131
<script src="filter/filterSideBar.js" charset="utf-8"></script>
3232
<script src="controller/dashboardController.js" charset="utf-8"></script>
33+
<script src="filter/filterDashboard.js" charset="utf-8"></script>
34+
<script src="controller/sideNavController.js" charset="utf-8"></script>
3335
</html>

‎Web/SinglePageAngularJS/templates/dashboard.html‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
<div layout="row" layout-wrap >
2-
<md-card ng-repeat="file in data" aria-label="" class="card" flex-gt-sm="30" ng-controller="dashboardCtr">
2+
<md-card ng-repeat="file in data | filterDashboard : uniqueManufacturer : uniqueStorage " class="card" flex-gt-sm="30" ng-controller="dashboardCtr">
33
<md-card-title>
44
<md-card-title-text>
5-
<p>{{file.name}}</p>
5+
<pstyle="font-weight:bold ">{{file.name}}</p>
66
</md-card-title-text>
77
</md-card-title>
88

99
<img ng-src="{{file.image.small}}" class="md-card-image" alt="Washed Out" style="height:150,width:100" >
10-
<md-card-content>
10+
<md-card-content>
11+
<p>Manufacturer : {{file.specs.manufacturer}}</p>
12+
<p>OS : {{file.specs.os}}</p>
13+
<p>Storage : {{file.specs.storage}}</p>
14+
<p>Camera : {{file.specs.camera}}</p>
1115

12-
</md-card-content>
13-
<md-card-actions layout="row" layout-align="end center">
14-
<p>${{file.price}}</p>
15-
<md-button ng-click="showAdvanced($event,file)">Buy</md-button>
16+
</md-card-content>
17+
18+
<md-card-actions layout="row" >
19+
<div class="" flex="auto">
20+
<md-button ng-click="showAdvanced(file)" style="font-weight:bold;font-style:italic;margin:10px;">Buy</md-button>
21+
</div>
22+
<!-- <img src="bower_components/material-design-icons/icons8-us-dollar-80.png" alt="" style="height:20px;width:20px;"> -->
23+
<md-card-actions layout="row" layout-align="end">
24+
<p style="font-weight:bold;">$ {{file.price}}</p>
25+
</md-card-actions>
1626
</md-card-actions>
1727
</md-card>
1828

‎Web/SinglePageAngularJS/templates/popup.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<md-dialog aria-label="Shubham" ng-controller="dashboardCtr">
22
<form>
3-
<md-toolbar>
3+
<md-toolbarstyle="background-color:grey;">
44
<div class="md-toolbar-tools">
5-
<h2>Phones</h2>
5+
<h2>{{locals.name}}</h2>
66
<span flex></span>
77
<md-button class="md-icon-button" ng-click="cancel()">
88
<md-icon md-svg-src="bower_components/material-design-icons/navigation/svg/design/ic_close_48px.svg" aria-label="Close dialog"></md-icon>
@@ -12,9 +12,10 @@ <h2>Phones</h2>
1212

1313
<md-dialog-content>
1414
<div class="md-dialog-content">
15-
{{presentData.image.large}}
16-
<!-- <img src="assets/images/galaxy-s5-large.jpg"> -->
15+
<img ng-src="{{locals.image.large}}">
1716
</div>
17+
<p style="padding-left:20px;">Rating : {{locals.rating}}</p>
18+
<p style="padding-left:20px;">Description : {{locals.description}}</p>
1819
</md-dialog-content>
1920

2021
</form>

‎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"></md-checkbox>
12+
<md-checkbox 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"></md-checkbox>
21+
<md-checkbox 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"></md-checkbox>
29+
<md-checkbox 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"></md-checkbox>
37+
<md-checkbox 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 によって変換されたページ (->オリジナル) /