Skip to content

Commit 391ff6a

Browse files
laarniastridlaarniastrid
committed
testing loaded files
1 parent 94650f7 commit 391ff6a

File tree

11 files changed

+106
-78
lines changed

11 files changed

+106
-78
lines changed

‎main/app.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ angular.module('myApp', ['ui.router'])
2020
.state('lessonTests', {
2121
url: '/lessonTests',
2222
templateUrl: './html/lessonTests/lessonTestsTemplate.html'
23+
// controller: 'lessonTestsController'
2324
})
2425
.state('assessment', {
2526
url: '/assessment',

‎main/lessonTests/lessonFiles/js-lesson-vars.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<div class="lesson-tests-wrapper">
22

3-
43
<section class="lessonTests" ng-controller="lessonTestsController">
5-
{{vm.test}}
6-
{{test}}
4+
5+
<div>
6+
{{tests}}
7+
{{blob}}
8+
</div>
9+
710
<h2>JavaScript<br>Vars & Strings<br>Test</h2>
811
<div class="multiple-choice-wrapper">
912
<div class="quiz-options"><span class="test-question">1. Here's where we will put a question:</span><br>

‎main/lessonTests/lessonTestsController.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ angular.module('myApp')
22

33
.controller('lessonTestsController', function($scope) {
44

5-
var vm = this;
5+
$scope.test = 'test on ctrl';
6+
$scope.blob = 'blob on ctrl';
67

7-
vm.test = 'hi there';
8-
$scope.test = 'scope hi';
98

109
})

‎main/lessonTests/lessonTestsDirective.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
angular.module('myApp')
22

3-
.directive('lessonTestsDirective', function($state) {
3+
.directive('lessonTestsDirective', function($state, $compile) {
44

55
return {
66
restrict: 'A',
7-
controller: 'lessonTestsController',
87
link: function(scope, ele, attr) {
98

9+
// scope.blob = 'hi there';
10+
// console.log(scope);
11+
// console.log(scope.blob);
12+
1013
// lesson test page load
1114
$('.lesson-test').click(function() {
1215
let selectedParent = this.parentNode.parentNode.parentNode.parentNode;
1316
let testNavigation = function() {
14-
$('.lesson-tests-wrapper').load('./html/lessonTests/lessonFiles/' + selectedParent.id + '.html');
17+
let temp = './html/lessonTests/lessonFiles/' + selectedParent.id + '.html';
18+
19+
20+
console.log(temp);
21+
22+
23+
24+
$('.lesson-tests-wrapper').load(temp);
1525
}
1626

1727
$('html, body').animate({ scrollTop: 0 }, 300);

‎main/lessonTests/lessonTestsTemplate.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<lessons-side-bar-directive></lessons-side-bar-directive>
33

44
<div class="content-wrapper">
5-
<div class="lesson-tests-wrapper">
5+
<div class="lesson-tests-wrapper" ng-controller="lessonTestsController">
66
</div>
77

8+
<!-- {{tests.tests}} --> <!-- controller works here -->
89

910
<!-- <section class="lessonTests" ng-controller="lessonTestsController">
1011
<h2>JavaScript<br>Vars & Strings<br>Test</h2>

‎main/lessons/lessonsSideBarTemplate.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<div id="side-bar-placeholder"></div>
22

3-
<section lesson-tests-directive class="lessons-wrapper">
3+
<!-- <section lesson-tests-directive class="lessons-wrapper"> -->
4+
<section lesson-tests-directive class="lessons-wrapper" ng-controller="lessonTestsController">
45
<div class="lessons">
56

67
<div id="js-lesson-vars">

‎public/html/lessonTests/lessonFiles/js-lesson-vars.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<div class="lesson-tests-wrapper">
22

3-
43
<section class="lessonTests" ng-controller="lessonTestsController">
5-
{{vm.test}}
6-
{{test}}
4+
5+
{{tests}}
6+
{{blob}}
7+
78
<h2>JavaScript<br>Vars & Strings<br>Test</h2>
89
<div class="multiple-choice-wrapper">
910
<div class="quiz-options"><span class="test-question">1. Here's where we will put a question:</span><br>

‎public/html/lessonTests/lessonTestsTemplate.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<lessons-side-bar-directive></lessons-side-bar-directive>
33

44
<div class="content-wrapper">
5-
<div class="lesson-tests-wrapper">
5+
<div class="lesson-tests-wrapper" ng-controller="lessonTestsController">
66
</div>
77

8+
<!-- {{tests.tests}} --> <!-- controller works here -->
89

910
<!-- <section class="lessonTests" ng-controller="lessonTestsController">
1011
<h2>JavaScript<br>Vars & Strings<br>Test</h2>

‎public/html/lessons/lessonsSideBarTemplate.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<div id="side-bar-placeholder"></div>
22

3-
<section lesson-tests-directive class="lessons-wrapper">
3+
<!-- <section lesson-tests-directive class="lessons-wrapper"> -->
4+
<section lesson-tests-directive class="lessons-wrapper" ng-controller="lessonTestsController">
45
<div class="lessons">
56

67
<div id="js-lesson-vars">

‎public/scripts/all.js‎

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ angular.module('myApp', ['ui.router'])
2020
.state('lessonTests', {
2121
url: '/lessonTests',
2222
templateUrl: './html/lessonTests/lessonTestsTemplate.html'
23+
// controller: 'lessonTestsController'
2324
})
2425
.state('assessment', {
2526
url: '/assessment',
@@ -32,6 +33,40 @@ angular.module('myApp', ['ui.router'])
3233

3334
}]) // end config
3435

36+
angular.module('myApp')
37+
38+
.controller('assessmentController', ["$scope", "assessmentService", function($scope, assessmentService) {
39+
40+
$scope.getAssessment = () => {
41+
assessmentService.getLesson().then((assessment) => {
42+
$scope.assessment = assessment;
43+
})
44+
}
45+
46+
var editor = ace.edit("editor");
47+
editor.setTheme("ace/theme/chrome");
48+
editor.getSession().setMode("ace/mode/javascript");
49+
50+
var editor_1 = ace.edit("editor_1");
51+
editor_1.setTheme("ace/theme/chrome");
52+
editor_1.getSession().setMode("ace/mode/javascript");
53+
54+
}])
55+
56+
angular.module('myApp').service('assessmentService', ["$q", "$http", function($q, $http) {
57+
58+
59+
this.getAssessment = () => {
60+
return $http({
61+
method: 'GET',
62+
url: '/api/assessment/js'
63+
}).then((response) => {
64+
return response;
65+
})
66+
}
67+
}])
68+
69+
3570
angular.module('myApp')
3671

3772
.directive('unitTestMenuDirective', function() {
@@ -90,40 +125,6 @@ angular.module('myApp')
90125
})
91126
*/
92127

93-
angular.module('myApp')
94-
95-
.controller('assessmentController', ["$scope", "assessmentService", function($scope, assessmentService) {
96-
97-
$scope.getAssessment = () => {
98-
assessmentService.getLesson().then((assessment) => {
99-
$scope.assessment = assessment;
100-
})
101-
}
102-
103-
var editor = ace.edit("editor");
104-
editor.setTheme("ace/theme/chrome");
105-
editor.getSession().setMode("ace/mode/javascript");
106-
107-
var editor_1 = ace.edit("editor_1");
108-
editor_1.setTheme("ace/theme/chrome");
109-
editor_1.getSession().setMode("ace/mode/javascript");
110-
111-
}])
112-
113-
angular.module('myApp').service('assessmentService', ["$q", "$http", function($q, $http) {
114-
115-
116-
this.getAssessment = () => {
117-
return $http({
118-
method: 'GET',
119-
url: '/api/assessment/js'
120-
}).then((response) => {
121-
return response;
122-
})
123-
}
124-
}])
125-
126-
127128
angular.module('myApp')
128129

129130
.directive('lessonsSideBarDirective', function() {
@@ -145,27 +146,36 @@ angular.module('myApp')
145146

146147
.controller('lessonTestsController', ["$scope", function($scope) {
147148

148-
var vm = this;
149+
$scope.test = 'test on ctrl';
150+
$scope.blob = 'blob on ctrl';
149151

150-
vm.test = 'hi there';
151-
$scope.test = 'scope hi';
152152

153153
}])
154154

155155
angular.module('myApp')
156156

157-
.directive('lessonTestsDirective', ["$state", function($state) {
157+
.directive('lessonTestsDirective', ["$state", "$compile", function($state, $compile) {
158158

159159
return {
160160
restrict: 'A',
161-
controller: 'lessonTestsController',
162161
link: function(scope, ele, attr) {
163162

163+
// scope.blob = 'hi there';
164+
// console.log(scope);
165+
// console.log(scope.blob);
166+
164167
// lesson test page load
165168
$('.lesson-test').click(function() {
166169
let selectedParent = this.parentNode.parentNode.parentNode.parentNode;
167170
let testNavigation = function() {
168-
$('.lesson-tests-wrapper').load('./html/lessonTests/lessonFiles/' + selectedParent.id + '.html');
171+
let temp = './html/lessonTests/lessonFiles/' + selectedParent.id + '.html';
172+
173+
174+
console.log(temp);
175+
176+
177+
178+
$('.lesson-tests-wrapper').load(temp);
169179
}
170180

171181
$('html, body').animate({ scrollTop: 0 }, 300);

0 commit comments

Comments
 (0)