[#840]:Some changes made

open-learning-exchange · Jun 8, 2017 · efee3b0 · efee3b0
1 parent 1e319ff
commit efee3b0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 39 deletions.
diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
@@ -98,7 +98,7 @@ $(function() {
             'password-reset': 'showPasswordReset',
             'courseCareerPath':'CourseCareerPath',
             'courseCareerPath/add':'addCareerPath',
-            'courseCareerPath/manage/:careernmae':'ManageCourseCareer'
+            'courseCareerPath/manage/:careernmae':'manageCourseCareer'
         },
         addOrUpdateWelcomeVideoDoc: function() {
             // fetch existing welcome video doc if there is any
@@ -6769,6 +6769,25 @@ $(function() {
             var directionOfLang = App.languageDict.get('directionOfLang');
             applyCorrectStylingSheet(directionOfLang) 
 
+        },
+        manageCourseCareer: function(cname){
+            var courseCareerPath = new App.Collections.CourseCareerPath()
+            courseCareerPath.memberId = $.cookie('Member._id');
+            courseCareerPath.CoursePathName =cname;
+            courseCareerPath.fetch({
+                async:false
+            });
+            console.log(courseCareerPath)
+            var manageCouseCareer = new App.Views.ManageCourseCareer({
+                collection:courseCareerPath
+            });
+            manageCouseCareer.render();
+            App.$el.children('.body').html('<div id="CourseCareerManage"></div>');
+            $('#CourseCareerManage').append('<div><h2>'+App.languageDict.attributes.Add_Multiple_Courses+'</h2></div>')
+            $('#CourseCareerManage').append(manageCouseCareer.el);
+            var directionOfLang = App.languageDict.get('directionOfLang');
+            applyCorrectStylingSheet(directionOfLang) 
+
         }
 
     }))

diff --git a/app/MyApp/app/views/AddCourseCareer.js b/app/MyApp/app/views/AddCourseCareer.js
@@ -31,28 +31,10 @@ $(function() {
             savecoursecareer.set('CourseIds',selectedCourseId);
             savecoursecareer.set('MemberID',$.cookie('Member._id'));
             savecoursecareer.save(null, {
-                success: function() {
-                    var coursecareer = new App.Collections.CourseCareerPath()
-                    coursecareer.memberId = $.cookie('Member._id');
-                    coursecareer.CoursePathName = courseCareerTitle
-                    coursecareer.fetch({
-                        async:false
-                    });
-                    console.log(coursecareer)
-                    var manageCaoursecareer = new App.Views.ManageCourseCareer({
-                        collection:coursecareer
-                    });
-                    manageCaoursecareer.render()
-
-                        $('#ManageCourseCareer').append(manageCaoursecareer.el)
-                        Backbone.history.navigate('courseCareerPath/add', {
-                            trigger: true
-                        })
+                error: function() {
+                    console.log("Not Saved")
                 }
-
-
             });
-
         },
 
 

diff --git a/app/MyApp/app/views/ManageCourseCareer.js b/app/MyApp/app/views/ManageCourseCareer.js
@@ -3,13 +3,15 @@ $(function() {
     App.Views.ManageCourseCareer = Backbone.View.extend({
         template: $('#template-careerPathManage').html(),
         vars: {},
+        events: {},
 
         initialize: function() {
 
         },
 
         render: function() {
             console.log(this.collection)
+
             this.$el.html(_.template(this.template,this.vars))
         },
     })

diff --git a/app/MyApp/index.html b/app/MyApp/index.html
@@ -1477,40 +1477,29 @@ <h4 id="new-quiz"><%= languageDict.attributes.New_Career_Path %></h4>
             </form>
         </div>
         <div>
-           <!-- <table class="btable btable-striped">
-                    <th style="width: 430px"><%= languageDict.attributes.Course_Career %></th>
-                    <th style="width: 430px"><%= languageDict.attributes.Level_Name %></th>
+            <table class="btable btable-striped">
+                    <th style="width: 230px"><%= 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>              
-                            <td><%= careerList[i].Level_Name %></td>
+                            <td><%= careerList[i].CoursePathName %></td>
                             <td><ul><li><%= careerList[i].Courses %></li></ul></td>
                             <td><button  class='course btn btn-success'><%=languageDict.attributes.EditLabel%></button></td>
                             <td><button  class='destroy btn btn-danger' style="margin-right: 420px;"><%=languageDict.attributes.DeleteLabel%></button></td>
+                            <td><button  class='btn btn-info' id="ManageCareer" onclick = "document.location.href='#courseCareerPath/manage/<%= careerList[i].CoursePathName %>'" style="margin-left: -550px;"><%=languageDict.attributes.View_Details%></button></td>
                         </tr>
                     <% } %>
-            </table>-->
+            </table>
 
         </div>
 
     </script>
 
     <script type="text/template" id="template-careerPathManage">
         <hr/>
-        <h4 id="new-quiz"><%= languageDict.attributes.Add_Level %></h4>
-        <form>
-            Title<br/>
-            <input type = "text" name = "title"/><br/>
-            Description<br/><textarea></textarea><br/>
-            Level<br/>
-            <input type = "text" name = "title" disabled ="disabled"/><br/>
-            Courses<br/>
-             <select id="LCourse" name = "LCourse"><br/>
-                        <option value=''></option>
-                </select>
-        </form>
+            <div id ="Manage">
+            </div>
     </script>
 
     <script type="text/html" id="template-courseLevelsTable">