diff --git a/app/MyApp/app/collections/CourseCareerPath.js b/app/MyApp/app/collections/CourseCareerPath.js index fb0ee19a7..3125a8017 100644 --- a/app/MyApp/app/collections/CourseCareerPath.js +++ b/app/MyApp/app/collections/CourseCareerPath.js @@ -2,7 +2,11 @@ $(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' @@ -20,7 +24,12 @@ $(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 16c6fb884..d596e7928 100644 --- a/app/MyApp/app/views/AddCourseCareer.js +++ b/app/MyApp/app/views/AddCourseCareer.js @@ -51,6 +51,15 @@ $(function() { arrcourses.push(courseslist) arrCourseIds.push(courseId) } + var courseCareers = new App.Collections.CourseCareerPath() + courseCareers.memberId = $.cookie('Member._id'); + courseCareers.fetch({ + async:false + }); + this.vars.careerList = []; + for(var i = 0; i < (courseCareers.length -1 ); i++) { + this.vars.careerList.push(courseCareers.models[i].attributes); + } this.vars.Courselist = arrcourses this.vars.Courseid = arrCourseIds this.vars.Course_Length = this.collection.models.length-1 diff --git a/app/MyApp/index.html b/app/MyApp/index.html index 240d39287..4844403c1 100644 --- a/app/MyApp/index.html +++ b/app/MyApp/index.html @@ -1486,6 +1486,13 @@

<%= languageDict.attributes.New_Career_Path %>

<%= languageDict.attributes.Course_Career %> <%= languageDict.attributes.Courses_List %> <%= languageDict.attributes.Actions %> + <% for (var i=0; i < careerList.length; i++){%> + + <%= careerList[i].CoursePathName %>Courses + <%= careerList[i].Courses %> + + + <% } %>