Skip to content
This repository has been archived by the owner on Aug 21, 2018. It is now read-only.

840 course career path(connects #840) #882

Open
wants to merge 39 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
72c77d2
[#840]: Layout Created For CareerPath
Pr0chin Jun 1, 2017
1c0bfd5
[#840]: Career Path
Pr0chin Jun 2, 2017
acce8e6
[#840] added multiselect feature
Rupesh87 Jun 2, 2017
ec0d6a9
[#840] Some Changes
Pr0chin Jun 2, 2017
6bf8c55
[#840]:CLean Conflict
Pr0chin Jun 2, 2017
0db709e
[#840] select value and save career
Rupesh87 Jun 5, 2017
d79ab6c
[#840]:Changes Made
Pr0chin Jun 5, 2017
3e23999
[#840]: Removed Conflit
Pr0chin Jun 5, 2017
472c573
[#840]:list of courseCareer
Rupesh87 Jun 5, 2017
b6b7650
[#840]:Upgrading
Pr0chin Jun 5, 2017
aa9400f
[#840]:Removed conflicts
Pr0chin Jun 5, 2017
72f41a5
[#840]:AddCourseCareer completed
Pr0chin Jun 5, 2017
1e319ff
[#840]:Setting new concept
Pr0chin Jun 6, 2017
efee3b0
[#840]:Some changes made
Pr0chin Jun 8, 2017
2d1ab43
[#840]:Upgraded some changes
Pr0chin Jun 9, 2017
8d181f6
[#840]save required career
Rupesh87 Jun 9, 2017
b79af87
[#840]-edit careerpath
Rupesh87 Jun 9, 2017
ed5410b
[#840]Delete and search
razu9861 Jun 9, 2017
59ac284
[#840]:Latest push Course Career
Pr0chin Jun 9, 2017
9d8958c
[#840]-changes on carrerpath
razu9861 Jun 12, 2017
6a26b1e
840-Remover Merge Conflict
Pr0chin Jun 13, 2017
de5b792
840:Changed as per required
Pr0chin Jun 14, 2017
4c288a7
[#840]:features added
razu9861 Jun 14, 2017
e65d1a9
[#840] Tab Function
Pr0chin Jun 16, 2017
a4fba58
[#840] Tab Functionality
Pr0chin Jun 19, 2017
dd4f37e
[#840] Upgraded changes
Pr0chin Jun 19, 2017
44cf88f
[#840] Made some changes
Pr0chin Jun 20, 2017
0ff745c
Merge branch '840-Course-Career-Path' of https://github.com/open-lear…
Pr0chin Jun 20, 2017
979fa97
[#840]-Career path
razu9861 Jun 21, 2017
422c207
[#840]:list career added
razu9861 Jun 26, 2017
1134278
[#840] Career Path
razu9861 Oct 9, 2017
e396ec4
[#840] careerpath
razu9861 Oct 11, 2017
a6395f6
[#840] unwanted files removed
razu9861 Oct 11, 2017
c9a06d2
careerppath
razu9861 Oct 27, 2017
c454d57
[#840] Career detail view
razu9861 Nov 2, 2017
e94449c
Merge branch 'dev' into 840-Course-Career-Path
razu9861 Jan 15, 2018
59256b6
[#840] indentation fixed
razu9861 Jan 15, 2018
731c52e
Update Text.json
razu9861 Jan 15, 2018
b14251a
[#840] indentation fixed
razu9861 Jan 15, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[#840] Tab Function
  • Loading branch information
Pr0chin committed Jun 16, 2017
commit e65d1a92dff768e3276dd49c70adef1c9220f8fb
14 changes: 8 additions & 6 deletions app/MyApp/app/Router.js
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ $(function() {
'resource/search': 'bellResourceSearch',
'search-bell/:levelId/:rId': 'SearchBell',
'assign-to-level': 'AssignResourcetoLevel',
'courses': 'Courses',
'courses(/courseCareerPath)': 'Courses',
'course/manage/:courseId': 'ManageCourse',
'course/details/:courseId/:courseName': 'courseDetails',
'usercourse/details/:courseId/:courseName': 'UserCourseDetails',
@@ -96,8 +96,8 @@ $(function() {
'listLearnersCredits/:cid': 'showLearnersListForCredits',
'passwordResetEmail': 'showPasswordResetEmail',
'password-reset': 'showPasswordReset',
'courseCareerPath':'CourseCareerPath',
'courseCareerPath/add':'addCareerPath',
//'courseCareerPath':'CourseCareerPath',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this code not just comment out

'courseCareerPath':'addCareerPath',
'courseCareerPath/manage/:careername/:careerId':'manageCourseCareer'
},
addOrUpdateWelcomeVideoDoc: function() {
@@ -2178,12 +2178,12 @@ $(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" class="btn btn-info" style = "margin-left: 15px;" href="#courseCareerPath/add">'+App.languageDict.attributes.Course_Career_Path+'</a>'
//button += '<a id="courseCareerPath" style = "margin-left: 15px;" href="#courseCareerPath/add">'+App.languageDict.attributes.Course_Career_Path+'</a>'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this code

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>'
$('#parentLibrary').append( button);
$('#parentLibrary').append('<h3 id="headingOfCourses">'+App.languageDict.attributes.Courses+'</h3>')
$('#parentLibrary').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;">'+languageDict.attributes.Course_Career_Path+'</a></p>')
$('#parentLibrary').append(coursesTable.el);
coursesTable.changeDirection();
if(directionOfLang.toLowerCase()==="right")
@@ -6764,7 +6764,9 @@ $(function() {
});
addCourseCareer.render()
App.$el.children('.body').html('<div id="ManageCourseCareer"></div>');
$('#ManageCourseCareer').append('<div><h2>'+App.languageDict.attributes.Career_Path+'</h2></div>')
$('#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: 24px;" onclick=showRequestForm("Course")>'+App.languageDict.attributes.Request_Course+'</a>')
$('#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;">'+languageDict.attributes.Course_Career_Path+'</a></p>')
$('#ManageCourseCareer').append(addCourseCareer.el);
$("#EditCareerPath").hide();
$('#LCourse').multiselect().multiselectfilter();
7 changes: 2 additions & 5 deletions app/MyApp/index.html
Original file line number Diff line number Diff line change
@@ -1460,11 +1460,8 @@ <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: -80px; margin-left: 1212px; height: 28px; width: 170px;">
<button style="margin-top: -120px; margin-left: 1407px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button>
<button class="back_button btn btn-primary" onclick = "document.location.href='#courses'"><%= languageDict.attributes.Back_To_Course %></button>
<hr/>
<h4 id="new-quiz"><%= languageDict.attributes.New_Career_Path %></h4>
<input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -233px; margin-left: 1056px; height: 28px; width: 170px;">
<button style="margin-top: -275px; margin-left: 1251px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button>
<div class ="multipleCourse">
<form>
<label for="cpName"><%= languageDict.attributes.Career_Path_Name %></label>