[#840]:Removed conflicts

open-learning-exchange · Jun 5, 2017 · aa9400f · aa9400f
2 parents b6b7650 + 472c573
commit aa9400f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git 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
@@ -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
@@ -1486,6 +1486,13 @@ <h4 id="new-quiz"><%= languageDict.attributes.New_Career_Path %></h4>
                     <th style="width: 430px"><%= languageDict.attributes.Course_Career %></th>
                     <th style="width: 430px"><%= languageDict.attributes.Courses_List %></th>
                     <th><%= languageDict.attributes.Actions %><th>
+                    <% for (var i=0; i < careerList.length; i++){%>
+                        <tr>
+                            <td><%= careerList[i].CoursePathName %></td>Courses
+                            <td><%= careerList[i].Courses %></td>
+                            <td><button  class='destroy btn btn-danger'><%=languageDict.attributes.DeleteLabel%></button></td>
+                        </tr>
+                    <% } %>
             </table>
         </div>