ready for export

samldd · Oct 7, 2016 · 93c241c · 93c241c
1 parent 3f44bd3
commit 93c241c
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 57 deletions.
diff --git a/app/components/bubble-graph.js b/app/components/bubble-graph.js
@@ -9,7 +9,7 @@ export default Ember.Component.extend({
   data: null,
 
   didInsertElement: function () {
-    this.draw()
+    this.draw();
   },
 
   draw: function() {
@@ -23,11 +23,7 @@ export default Ember.Component.extend({
       d3.select("#" + this.get("elementId")).select("#bubble").remove();
     }catch(err){}
 
-    var height = this.get('height');
-    var width = this.get('width');
-
     var diameter = 500,
-        format = d3.format(",d"),
         color = d3.scale.category20c();
 
     var bubble = d3.layout.pack()

diff --git a/app/controllers/bubble.js b/app/controllers/bubble.js
@@ -2,26 +2,21 @@ import Ember from 'ember';
 
 export default Ember.Controller.extend({
 
-  dataloaded: false,
-
   date: null,
 
-  //graphData: null,
-
   ajax: Ember.inject.service(),
 
   data: Ember.computed('date', function(){
-    if(this.get('date') == null){
+    if(this.get('date') === null){
       return;
     }
     return this.get('ajax').request('/bubble/', {data: {date:this.get('date')}}).then(
        (res) => {
         var data = [];
-        res.data.forEach(function(m,i){
+        res.data.forEach(function(m){
           data.push({className:m.attributes.name, value:m.attributes.count});
         });
         return {children:data};
-        this.set( 'dataloaded', true);
       }
     );
   }),

diff --git a/app/controllers/improvements.js b/app/controllers/improvements.js
@@ -5,10 +5,10 @@ export default Ember.Controller.extend({
   employee: Ember.computed('model', function(){
     var measurements = this.get('model.employee');
     var data = [];
-    if (measurements == undefined){
+    if (measurements === undefined){
       return data;
     }
-    measurements.forEach(function(m,i){
+    measurements.forEach(function(m){
       data.push({className:m.get('name'), value:m.get('count'), occ:m.get('occupation')});
     });
     return {children:data};
@@ -17,10 +17,10 @@ export default Ember.Controller.extend({
   skill: Ember.computed('model', function(){
     var measurements = this.get('model.skill');
     var data = [];
-    if (measurements == undefined){
+    if (measurements === undefined){
       return data;
     }
-    measurements.forEach(function(m,i){
+    measurements.forEach(function(m){
       data.push({className:m.get('name'), value:m.get('count')});
     });
     return {children:data};

diff --git a/app/controllers/occupations.js b/app/controllers/occupations.js
@@ -9,14 +9,12 @@ export default Ember.Controller.extend({
   actions: {
 
     onSelect (theOcc){
-      console.log("controller/occupations.js - onSelect");
       this.set('select', theOcc);
       this.transitionToRoute('occupations.occupation.bubble', theOcc.get('id'));
     },
 
     handleKeydown(dropdown, e) {
           if (e.keyCode !== 13) { return; }
-          console.log("controller/occupations.js - handleKeydown");
           let text = e.target.value;
           let self = this;
           if (text.length > 0) {

diff --git a/app/controllers/projects/index.js b/app/controllers/projects/index.js
@@ -23,7 +23,7 @@ export default Ember.Controller.extend({
         name: '',
         start: '',
         end:'',
-      })
+      });
     },
 
     deleteTask: function(id){

diff --git a/app/controllers/projects/project.js b/app/controllers/projects/project.js
@@ -60,7 +60,7 @@ export default Ember.Controller.extend({
                     return result;
                   });
 
-                self.set("skills", skills)
+                self.set("skills", skills);
 
                 }
             );

diff --git a/app/controllers/projects/project/skill.js b/app/controllers/projects/project/skill.js
@@ -43,6 +43,8 @@ export default Ember.Controller.extend({
       });
 
       newEmp.save();
+
+      this.transitionToRoute("projects.project");
     }
   }
 

diff --git a/app/controllers/skills/skill/bubble.js b/app/controllers/skills/skill/bubble.js
diff --git a/app/controllers/skills/skill/timeline.js b/app/controllers/skills/skill/timeline.js
@@ -9,10 +9,10 @@ export default Ember.Controller.extend({
     console.log('new data');
     var measurements = this.get('model.measurements');
     var data = [];
-    if (measurements == undefined){
+    if (measurements === undefined){
       return data;
     }
-    measurements.forEach(function(m,i){
+    measurements.forEach(function(m){
       data.push({x:m.get('date'), y:m.get('value')});
     });
     return data;

diff --git a/app/models/employee-project.js b/app/models/employee-project.js
@@ -1,6 +1,4 @@
-/**
- * Created by sam on 03.10.16.
- */
+import DS from 'ember-data';
 
 export default DS.Model.extend({
 

diff --git a/app/models/employee.js b/app/models/employee.js
@@ -1,7 +1,4 @@
-/**
- * Created by sam on 03.10.16.
- */
-
+import DS from 'ember-data';
 
 export default DS.Model.extend({
 

diff --git a/app/models/occupation.js b/app/models/occupation.js
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import DS from 'ember-data';
 
 export default DS.Model.extend({
@@ -8,4 +9,5 @@ export default DS.Model.extend({
     console.log("models/occupations.js - slug");
     return this.get('name').dasherize();
   }),
+
 });
diff --git a/app/models/skill.js b/app/models/skill.js
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import DS from 'ember-data';
 
 export default DS.Model.extend({

diff --git a/app/router.js b/app/router.js
@@ -23,7 +23,7 @@ Router.map(function() {
     });
   });
 
-  this.route('bubble')
+  this.route('bubble');
 });
 
 export default Router;
diff --git a/app/routes/improvements.js b/app/routes/improvements.js
@@ -5,8 +5,7 @@ export default Ember.Route.extend({
 
   store: Ember.inject.service(),
 
-  model: function (params) {
-    console.log(  "routes/improvements.js - model");
+  model: function () {
     return this.get('ajax').request('/improvements/').then(
         (res) => {
           this.get('store').pushPayload(res);

diff --git a/app/routes/skills/skill.js b/app/routes/skills/skill.js
@@ -3,7 +3,6 @@ import Ember from 'ember';
 export default Ember.Route.extend({
 
   model: function (params) {
-    console.log("routes/skills/skill.js - model");
     return this.get('store').peekRecord('skill', params.id);
   }
 

diff --git a/app/routes/skills/skill/timeline.js b/app/routes/skills/skill/timeline.js
@@ -8,8 +8,7 @@ export default Ember.Route.extend({
 
   store: Ember.inject.service(),
 
-  model: function (params) {
-    console.log(  "routes/skills/skill/timeline.js - model");
+  model: function () {
     return this.get('ajax').request('/timeline/', {data: {skillid: this.modelFor('skills.skill').get('id')}}).then(
         (res) => {
           this.get('store').pushPayload(res);

diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -9,7 +9,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#">My Job Wallet</a>
+          <a class="navbar-brand">My Job Wallet</a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
           <ul class="nav navbar-nav">

diff --git a/app/templates/welcome.hbs b/app/templates/welcome.hbs
@@ -1,3 +1,7 @@
 <h1> Welcome to JobWallet.org</h1>
 
-<p> Welcome to the job wallet application. Have fun managing your company </p>
+<p> Welcome to the job wallet application. Have fun managing your company! </p>
+
+<br>
+
+<img src="assets/company.png" alt="Company" style="width:700px;height:350px;margin-top: 2cm;">
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ export default Ember.Controller.extend({ @@
             name: '',
             start: '',
             end:'',
-          })
+          });
         },
         deleteTask: function(id){
@@ Expand Down @@