[#840] Career Path

open-learning-exchange · Oct 9, 2017 · 1134278 · 1134278
1 parent 422c207
commit 1134278
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
@@ -2178,7 +2178,6 @@ $(function() {
                     var button = '<p id="library-top-buttons">'
                     button += '<a id="addCourseButton" class="btn btn-success" href="#course/add">'+App.languageDict.attributes.Add_Course+'</a>'
                     button += '<a id="requestCourseButton" class="btn btn-success" onclick=showRequestForm("Course")>'+App.languageDict.attributes.Request_Course+'</a>'
-                    //button += '<a id="courseCareerPath"  style = "margin-left: 15px;" href="#courseCareerPath/add">'+App.languageDict.attributes.Course_Career_Path+'</a>'
                     button += '<span id="searchSpan"><input id="searchText" value="" size="30" style="height:24px;margin-top:1%;" type="text"><span style="margin-left:10px">'
                     button += '<button class="btn btn-info" onclick="CourseSearch()">'+App.languageDict.attributes.Search+'</button></span>'
                     button += '</p>'
@@ -6781,9 +6780,9 @@ $(function() {
             $('#ManageCourseCareer').append('<a id="addCourseButton" class="btn btn-success" href="#course/add">'+App.languageDict.attributes.Add_Course+'</a>')
             $('#ManageCourseCareer').append('<a id="requestCourseButton" class="btn btn-success" style="margin: 13px;margin-left: 9px;" onclick=showRequestForm("Course")>'+App.languageDict.attributes.Request_Course+'</a>')
             if($.url().attr('fragment') == "courses") {
-                $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px; margin-bottom: -23px;color:#808080"><a href="#courses"style="font-size:30px;text-decoration: underline;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;"checked data-toggle="toggle">'+languageDict.attributes.Career_Path+'</a></p>')
+                $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px; color:#808080"><a href="#courses"style="font-size:30px;text-decoration: underline;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;"checked data-toggle="toggle">'+languageDict.attributes.Career_Path+'</a></p>')
             }else{
-                $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px; margin-bottom: -23px;color:#808080"><a href="#courses"style="font-size:30px;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;"checked data-toggle="toggle">'+languageDict.attributes.Career_Path+'</a></p>')
+                $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px; color:#808080"><a href="#courses"style="font-size:30px;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;"checked data-toggle="toggle">'+languageDict.attributes.Career_Path+'</a></p>')
             }
             $('#ManageCourseCareer').append(addCourseCareer.el);
             $("#EditCareerPath").hide();
@@ -6812,7 +6811,6 @@ $(function() {
             $('.ui-multiselect-filter').find('input').attr('placeholder',App.languageDict.attributes.KeyWord_s);
             $('#LCareer').attr("multiple", true);
             $('#LCareer').multiselect("uncheckAll");
-            ///
             var directionOfLang = App.languageDict.get('directionOfLang');
             applyCorrectStylingSheet(directionOfLang) 
         },

diff --git a/app/MyApp/app/views/AddCourseCareer.js b/app/MyApp/app/views/AddCourseCareer.js
@@ -139,6 +139,7 @@ $(function() {
 
 
         render: function() {
+            var careerlength;
             var arrcourses = []
             var arrCourseIds = []
             for(var i = 0; i <this.collection.models.length; i++){
@@ -148,7 +149,6 @@ $(function() {
                     arrcourses.push(courseslist)
                     arrCourseIds.push(courseId)
                 }
-
             }
             var courseCareers = new App.Collections.CourseCareerPath()
             courseCareers.memberId = $.cookie('Member._id');
@@ -162,7 +162,9 @@ $(function() {
                     this.vars.careerList.push(courseCareers.models[i].attributes);
                 }
             }
+
             this.vars.Courselist = arrcourses
+            this.vars.careerlength = careerlength
             this.vars.Courseid = arrCourseIds
             this.vars.Course_Length = this.collection.models.length-1
             ////PushRequired ID
@@ -172,10 +174,10 @@ $(function() {
                 if(courseCareers.models[j].attributes._id != '_design/bell'){
                     this.vars.CareerList.push(courseCareers.models[j].attributes.CoursePathName);
                     this.vars.careerListIds.push(courseCareers.models[j].attributes._id);
-                    this.vars.careerlength = j + 1
+                    // this.vars.careerlength = j + 1
                 }
-
             }
+             this.vars.careerlength =courseCareers.length-1
             this.$el.html(_.template(this.template,this.vars))
         },
     })

diff --git a/app/MyApp/index.html b/app/MyApp/index.html
@@ -308,7 +308,7 @@
     <script src="app/views/AnswerReview.js"></script> <!-- app/views.js -->
     <script src="app/views/PasswordReset.js"></script> <!-- app/views.js -->
     <script src="app/views/ManageCourseCareer.js"></script> <!-- app/views.js -->
-    <script src="app/views/CareerPathTable.js"></script> <!-- app/views.js -->
+    <!-- <script src="app/views/CareerPathTable.js"></script>  --><!-- app/views.js -->
 
 
     <!-- javaScript -->
@@ -1460,23 +1460,21 @@ <h4 style="width:25em;word-wrap:break-word;">
     </script>
 
     <script type="text/template" id="template-addCourseCareer">
-    <input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -137px; margin-left: 1056px; height: 28px; width: 170px;">
-        <button style="margin-top: -183px; margin-left: 1251px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button>
+    <!-- <input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -137px; margin-left: 1056px; height: 28px; width: 170px;">
+        <button style="margin-top: -183px; margin-left: 1251px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button> -->
         <div class ="multipleCourse">
             <form>
-                <label for="cpName"><b><%= languageDict.attributes.Career_Path_Name %></b></label>
-                <input type="text" id="careerPath" placeholder="Career Path Name" style="padding: 2px; margin-top: 8px;" required>
-                <label for="LCourse"><b><%= languageDict.attributes.List_of_Courses %></b></label>
+                <label for="cpName"><b><%= languageDict.attributes.Career_Path_Name %>:</b></label>
+                <input type="text" id="careerPath" placeholder="Career Path Name" style="padding: 2px; margin-top: 8px;" required> &nbsp;&nbsp;
+                <label for="LCourse"><b><%= languageDict.attributes.List_of_Courses %>:</b></label>
                 <select id="LCourse">
-                    <%for(var i =0; i<Course_Length;i++){%>
+                    <%for(var i =0; i< Course_Length;i++){%>
                         <option value='<%=Courseid[i]%>'><%=Courselist[i]%></option>
                     <%}%>
-                </select>
-                <label for="LCareer"><b><%= languageDict.attributes.Required_Course_Career_Path %></b></label>
-
+                </select>&nbsp;&nbsp;
+                <label for="LCareer"><b><%= languageDict.attributes.Required_Course_Career_Path %>:</b></label>
                 <select id="LCareer">
-
-                    <% for (var j =0; j<careerlength;j++){%>
+                    <% for (var j =0; j < careerlength;j++){%>
                         <option value ='<%=CareerList[j]%>'><%=CareerList[j]%></option>
                     <%}%>
                 </select>
@@ -1495,7 +1493,7 @@ <h4 style="width:25em;word-wrap:break-word;">
                     </tr>
                     <%for (var i=0; i < careerList.length; i++) {%>
                     <tr>
-                        <td><%= careerList[i].CoursePathName %></td>
+                        <td><a href="#usercourse/details/<%= Courseid[i] %>/<%= Courselist[i] %>"><%= careerList[i].CoursePathName %></a></td>
                         <td><ul><li><%= careerList[i].Courses %></li></ul></td>
                         <td><ul><li><%= careerList[i].requiredCareerPathIds%></li></ul></td>
                         <td>

diff --git a/init_docs/Text.json b/init_docs/Text.json
@@ -75,7 +75,7 @@
     "subject": "Subject(s)",
     "level": "Level(s)",
     "Level_Name":"Level Name",
-    "Required_Course_Career_Path":"Required Course Career Path",
+    "Required_Course_Career_Path":"Career",
     "Career_Path_Name":"Career Path Name",
     "Add_Course_Career_Level":"Add Course Career Level",
     "Course_Career":"Course Career",