jasonhofer · April 4, 2019 16:52 · Apr 4, 2019 · Apr 4, 2019 · Apr 4, 2019 · Apr 4, 2019
diff --git a/routes.certifications.my-training-programs.index.js b/routes.certifications.my-training-programs.index.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 // This "redirects" '/programs/my-journey' to '/programs/my-journey/123'
-// (But only if they user is assigned to a program.)
+// (But only if the user is assigned to a program.)
 export default Ember.Route.extend({
   beforeModel() {
     const programs = this.modelFor('certifications.my-training-programs');

diff --git a/routes.application.index.js b/routes.application.index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-
+// This "redirects" '/' to '/dashboard'
 export default Ember.Route.extend({
   beforeModel() {
   	this.replaceWith('dashboard');

diff --git a/routes.certifications.my-training-programs.index.js b/routes.certifications.my-training-programs.index.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 // This "redirects" '/programs/my-journey' to '/programs/my-journey/123'
+// (But only if they user is assigned to a program.)
 export default Ember.Route.extend({
   beforeModel() {
     const programs = this.modelFor('certifications.my-training-programs');

diff --git a/routes.certifications.index.js b/routes.certifications.index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-
+// This "redirects" '/programs' to '/programs/my-journey'
 export default Ember.Route.extend({
   beforeModel() {
   	this.replaceWith('certifications.my-training-programs');

diff --git a/routes.training.program.level.js b/routes.training.program.level.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-// This redirects '/programs/my-journey/123/level' to '/programs/my-journey/123/level/1'
+// This "redirects" '/programs/my-journey/123/level' to '/programs/my-journey/123/level/1'
 export default Ember.Route.extend({
   beforeModel() {
     const program = this.modelFor('training.program');

diff --git a/routes.training.program.index.js b/routes.training.program.index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-// This redirects '/programs/my-journey/123' to '/programs/my-journey/123/level'
+// This "redirects" '/programs/my-journey/123' to '/programs/my-journey/123/level'
 export default Ember.Route.extend({
   beforeModel() {
   	this.replaceWith('training.program.level', this.paramsFor('training.program').program_id);

diff --git a/routes.certifications.my-training-programs.index.js b/routes.certifications.my-training-programs.index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-// This redirects '/programs/my-journey' to '/programs/my-journey/123'
+// This "redirects" '/programs/my-journey' to '/programs/my-journey/123'
 export default Ember.Route.extend({
   beforeModel() {
     const programs = this.modelFor('certifications.my-training-programs');

diff --git a/routes.certifications.my-training-programs.index.js b/routes.certifications.my-training-programs.index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-
+// This redirects '/programs/my-journey' to '/programs/my-journey/123'
 export default Ember.Route.extend({
   beforeModel() {
     const programs = this.modelFor('certifications.my-training-programs');

diff --git a/routes.training.program.level.js b/routes.training.program.level.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-// This redirects when no level number is given in the URL (e.g. '/programs/my-journey/123/level')
+// This redirects '/programs/my-journey/123/level' to '/programs/my-journey/123/level/1'
 export default Ember.Route.extend({
   beforeModel() {
     const program = this.modelFor('training.program');

diff --git a/routes.training.program.index.js b/routes.training.program.index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-
+// This redirects '/programs/my-journey/123' to '/programs/my-journey/123/level'
 export default Ember.Route.extend({
   beforeModel() {
   	this.replaceWith('training.program.level', this.paramsFor('training.program').program_id);

diff --git a/routes.training.program.level.js b/routes.training.program.level.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-
+// This redirects when no level number is given in the URL (e.g. '/programs/my-journey/123/level')
 export default Ember.Route.extend({
   beforeModel() {
     const program = this.modelFor('training.program');

diff --git a/routes.certifications.my-training-programs.index.js b/routes.certifications.my-training-programs.index.js
@@ -1,12 +1,10 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-  //mockStore: Ember.inject.service(),
   beforeModel() {
     const programs = this.modelFor('certifications.my-training-programs');
     const primary  = programs.filter(program => 'primary' === program.type)[0];
     if (primary) {
-      //primary.levels = this.get('mockStore').findLevels(primary.id);
   		this.replaceWith('training.program', primary.id);
     }
   },

diff --git a/controllers.application.js b/controllers.application.js
@@ -1,4 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
-});

diff --git a/router.js b/router.js
@@ -15,7 +15,7 @@ Router.map(function() {
   this.route('certifications', {path: '/programs'}, function () {
   	this.route('my-training-programs', {path: '/my-journey'}, function () {
     	this.route('training.program', {path: '/:program_id', resetNamespace: true}, function () {
-      	this.route('level', {path: '/level'});
+      	this.route('level', {path: '/level'}); // "Redirects" to training.program-level
         this.route('training.program-level', {path: '/level/:level_num', resetNamespace: true});
       });
     });

diff --git a/templates.certifications.hbs b/templates.certifications.hbs
@@ -1,3 +1,5 @@
+{{!--
 <h3>Certifications</h3>
 <hr>
+--}}
 {{outlet}}
diff --git a/templates.certifications.my-training-programs.hbs b/templates.certifications.my-training-programs.hbs
@@ -1,7 +1,9 @@
+{{!--
 <h4>My Programs</h4>
 |
 {{#each model as |program|}}
 {{program.title}} |
 {{/each}}
 <hr>
+--}}
 {{outlet}}
diff --git a/templates.training.program.hbs b/templates.training.program.hbs
@@ -1,5 +1,4 @@
-<h5>My Journey: {{model.title}}</h5>
-<hr>
+<h4>{{model.title}}</h4>
 |
 {{#each model.levels as |level|}}
 {{#link-to 'training.program-level' model.id level.levelNum}}{{level.title}}{{/link-to}} |

diff --git a/routes.training.program.level.index.js b/routes.training.program.level.index.js
@@ -1,8 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  beforeModel() {
-    const program = this.modelFor('training.program');
-  	this.replaceWith('training.program-level', program.id, program.workingLevelNum || 1);
-  },
-});

diff --git a/templates.training.program.level.hbs b/templates.training.program.level.hbs
@@ -1,2 +0,0 @@
-<code>templates/training/program/level.hbs</code>
-<b>You should never see this</b>

diff --git a/routes.training.program.level.js b/routes.training.program.level.js
@@ -0,0 +1,8 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  beforeModel() {
+    const program = this.modelFor('training.program');
+  	this.replaceWith('training.program-level', program.id, program.workingLevelNum || 1);
+  },
+});
diff --git a/routes.training.program.js b/routes.training.program.js
@@ -4,7 +4,7 @@ export default Ember.Route.extend({
   mockStore: Ember.inject.service(),
   model(params) {
   	const program = this.get('mockStore').findRecord('program', params.program_id);
-    program.levels = this.get('mockStore').findLevels(program.id);
+    Ember.set(program, 'levels', this.get('mockStore').findLevels(program.id));
     return program;
   },
 });
diff --git a/templates.certifications.my-training-programs.hbs b/templates.certifications.my-training-programs.hbs
@@ -1,8 +1,7 @@
 <h4>My Programs</h4>
-<ul>
+|
 {{#each model as |program|}}
-	<li>{{program.title}}</li>
+{{program.title}} |
 {{/each}}
-</ul>
 <hr>
 {{outlet}}
diff --git a/templates.training.program.hbs b/templates.training.program.hbs
@@ -1,9 +1,8 @@
 <h5>My Journey: {{model.title}}</h5>
 <hr>
-<ul>
+|
 {{#each model.levels as |level|}}
-<ul>{{#link-to 'training.program-level' model.id level.levelNum}}{{level.title}}{{/link-to}}</ul>
+{{#link-to 'training.program-level' model.id level.levelNum}}{{level.title}}{{/link-to}} |
 {{/each}}
-</ul>
 <hr>
 {{outlet}}
diff --git a/templates.training.program.level.hbs b/templates.training.program.level.hbs
@@ -0,0 +1,2 @@
+<code>templates/training/program/level.hbs</code>
+<b>You should never see this</b>
diff --git a/routes.training.program.level.index.js b/routes.training.program.level.index.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   beforeModel() {
-  	this.replaceWith('training.program-level', this.paramsFor('training.program').program_id, 2);
+    const program = this.modelFor('training.program');
+  	this.replaceWith('training.program-level', program.id, program.workingLevelNum || 1);
   },
 });
diff --git a/routes.training.program-level.js b/routes.training.program-level.js
@@ -3,6 +3,6 @@ import Ember from 'ember';
 export default Ember.Route.extend({
   mockStore: Ember.inject.service(),
   model(params) {
-  	return this.get('mockStore').findLevelByNum('programLevel', this.paramsFor('training.program').program_id, params.level_num);
+  	return this.get('mockStore').findLevelByNum(this.paramsFor('training.program').program_id, params.level_num);
   },
 });
diff --git a/templates.training.program-level.hbs b/templates.training.program-level.hbs
@@ -1 +1 @@
-<i>Level Title: {{model.title}}</i>
+<i>Level Title: <b>{{model.title}}</b></i>
diff --git a/templates.training.program-level.hbs b/templates.training.program-level.hbs
@@ -1 +1 @@
-<i>{{model.title}}</i>
+<i>Level Title: {{model.title}}</i>
diff --git a/templates.training.program.hbs b/templates.training.program.hbs
@@ -2,7 +2,7 @@
 <hr>
 <ul>
 {{#each model.levels as |level|}}
-<ul>{{#link-to 'training.program-level' model.id level.id}}{{level.title}}{{/link-to}}</ul>
+<ul>{{#link-to 'training.program-level' model.id level.levelNum}}{{level.title}}{{/link-to}}</ul>
 {{/each}}
 </ul>
 <hr>

diff --git a/templates.training.program-level.hbs b/templates.training.program-level.hbs
@@ -1 +1 @@
-<i>Program Level Page</i>
+<i>{{model.title}}</i>
diff --git a/services.mock-store.js b/services.mock-store.js
@@ -20,7 +20,7 @@ export default Ember.Service.extend({
   },
 
   program: [
-    {id: 1, title: 'Program 1', levels: [1,2], type: 'secondary', workingLevelNum: 1},
+    {id: 1, title: 'Program 1', levels: [1,2], type: 'secondary'},
     {id: 2, title: 'Program 2', levels: [3,4,5], type: 'primary', workingLevelNum: 2},
   ],
 

diff --git a/routes.training.program-level.js b/routes.training.program-level.js
@@ -3,6 +3,6 @@ import Ember from 'ember';
 export default Ember.Route.extend({
   mockStore: Ember.inject.service(),
   model(params) {
-  	return this.get('mockStore').findLevelByNum('programLevel', params.level_num);
+  	return this.get('mockStore').findLevelByNum('programLevel', this.paramsFor('training.program').program_id, params.level_num);
   },
 });
diff --git a/services.mock-store.js b/services.mock-store.js
@@ -15,9 +15,13 @@ export default Ember.Service.extend({
   	return this.get('programLevel').filter(level => level.program === ~~programId);
   },
 
+  findLevelByNum(programId, levelNum) {
+  	return this.findLevels(programId).filter(level => level.levelNum === ~~levelNum)[0];
+  },
+
   program: [
-    {id: 1, title: 'Program 1', levels: [1,2], type: 'secondary'},
-    {id: 2, title: 'Program 2', levels: [3,4,5], type: 'primary'},
+    {id: 1, title: 'Program 1', levels: [1,2], type: 'secondary', workingLevelNum: 1},
+    {id: 2, title: 'Program 2', levels: [3,4,5], type: 'primary', workingLevelNum: 2},
   ],
 
   programLevel: [

diff --git a/routes.training.program-level.js b/routes.training.program-level.js
@@ -0,0 +1,8 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  mockStore: Ember.inject.service(),
+  model(params) {
+  	return this.get('mockStore').findLevelByNum('programLevel', params.level_num);
+  },
+});
diff --git a/templates.training.program.hbs b/templates.training.program.hbs
@@ -2,7 +2,7 @@
 <hr>
 <ul>
 {{#each model.levels as |level|}}
-<ul>{{#link-to 'training.program-level' model.id level.id}}</ul>
+<ul>{{#link-to 'training.program-level' model.id level.id}}{{level.title}}{{/link-to}}</ul>
 {{/each}}
 </ul>
 <hr>

diff --git a/services.mock-store.js b/services.mock-store.js
@@ -12,7 +12,7 @@ export default Ember.Service.extend({
   },
 
   findLevels(programId) {
-  	return this.get('programLevel').finter(level => level.program === ~~programId);
+  	return this.get('programLevel').filter(level => level.program === ~~programId);
   },
 
   program: [

diff --git a/templates.training.program.hbs b/templates.training.program.hbs
@@ -2,7 +2,7 @@
 <hr>
 <ul>
 {{#each model.levels as |level|}}
-<ul>{{level.title}}</ul>
+<ul>{{#link-to 'training.program-level' model.id level.id}}</ul>
 {{/each}}
 </ul>
 <hr>

diff --git a/routes.training.program.js b/routes.training.program.js
@@ -3,6 +3,8 @@ import Ember from 'ember';
 export default Ember.Route.extend({
   mockStore: Ember.inject.service(),
   model(params) {
-  	return this.get('mockStore').findRecord('program', params.program_id);
+  	const program = this.get('mockStore').findRecord('program', params.program_id);
+    program.levels = this.get('mockStore').findLevels(program.id);
+    return program;
   },
 });
diff --git a/templates.training.program.hbs b/templates.training.program.hbs
@@ -1,3 +1,9 @@
 <h5>My Journey: {{model.title}}</h5>
 <hr>
+<ul>
+{{#each model.levels as |level|}}
+<ul>{{level.title}}</ul>
+{{/each}}
+</ul>
+<hr>
 {{outlet}}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		<code>templates/training/program/level.hbs</code>
		<b>You should never see this</b>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<code>templates/training/program/level.hbs</code>
		<b>You should never see this</b>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<i>Level Title: {{model.title}}</i>
		<i>Level Title: <b>{{model.title}}</b></i>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<i>{{model.title}}</i>
		<i>Level Title: {{model.title}}</i>