diff --git a/app/MyApp/app/collections/CourseCareerPath.js b/app/MyApp/app/collections/CourseCareerPath.js index 3125a8017..393e4f22a 100644 --- a/app/MyApp/app/collections/CourseCareerPath.js +++ b/app/MyApp/app/collections/CourseCareerPath.js @@ -2,11 +2,7 @@ $(function() { App.Collections.CourseCareerPath = Backbone.Collection.extend({ url: function() { -<<<<<<< HEAD:app/MyApp/app/collections/CourseCareerPath.js - if (this.CoursePathName != "" && this.MemberID != "" && this.CoursePathName!= undefined && this.MemberID!= undefined ) { -======= if (this.CoursePathName!= undefined && this.MemberID!= undefined ) { ->>>>>>> 472c5738c0d410a390fededc50c57ccb59591d62:app/MyApp/app/collections/CourseCareerPath.js return App.Server + '/coursecareerpath/_design/bell/_view/GetCourseCareerByLevelNameMemberIds/?key=["' +this.CoursePathName + '","' +this.MemberID+ '"]&include_docs=true' } else { return App.Server + '/coursecareerpath/_all_docs?include_docs=true' @@ -24,11 +20,7 @@ $(function() { comparator: function(model) { var type = model.get('Type') if (type) return type.toLowerCase() -<<<<<<< HEAD:app/MyApp/app/collections/CourseCareerPath.js - }, -======= } ->>>>>>> 472c5738c0d410a390fededc50c57ccb59591d62:app/MyApp/app/collections/CourseCareerPath.js }) }) diff --git a/app/MyApp/app/views/AddCourseCareer.js b/app/MyApp/app/views/AddCourseCareer.js index d596e7928..ae372a30e 100644 --- a/app/MyApp/app/views/AddCourseCareer.js +++ b/app/MyApp/app/views/AddCourseCareer.js @@ -56,14 +56,18 @@ $(function() { courseCareers.fetch({ async:false }); + console.log(courseCareers) this.vars.careerList = []; - for(var i = 0; i < (courseCareers.length -1 ); i++) { - this.vars.careerList.push(courseCareers.models[i].attributes); + for(var i = 0; i < (courseCareers.length); i++) { + if(courseCareers.models[i].attributes._id !== "_design/bell"){ + this.vars.careerList.push(courseCareers.models[i].attributes); + } } + console.log(this.vars.careerList) this.vars.Courselist = arrcourses this.vars.Courseid = arrCourseIds this.vars.Course_Length = this.collection.models.length-1 - $el.html(_.template(this.template,this.vars)) + this.$el.html(_.template(this.template,this.vars)) }, }) diff --git a/app/MyApp/index.html b/app/MyApp/index.html index 4844403c1..1001e02bc 100644 --- a/app/MyApp/index.html +++ b/app/MyApp/index.html @@ -1484,13 +1484,15 @@
<%= languageDict.attributes.Course_Career %> | +<%= languageDict.attributes.Level_Name %> | <%= languageDict.attributes.Courses_List %> | <%= languageDict.attributes.Actions %> | <% for (var i=0; i < careerList.length; i++){%> | ||
---|---|---|---|---|---|---|
<%= careerList[i].CoursePathName %> | Courses +<%= careerList[i].CoursePathName %> | <%= careerList[i].Level_Name %> | <%= careerList[i].Courses %> | -+ | + |