From 361b4c2d6ba8006a4b2d86377ae4bd60f83ce41f Mon Sep 17 00:00:00 2001
From: Denial Tandel <denialtandel@cakewalk.in>
Date: Sun, 28 May 2017 16:29:02 +0530
Subject: [PATCH 1/7] Change : Updated Joblisting

---
 .../HRManagementApp/Admin/JobCreate.aspx      | 17 +++++++-
 .../HRManagementApp/Admin/candidate.js        | 43 ++++++++++++++++---
 .../HRManagementApp/Services/Services.asmx.cs |  1 +
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx b/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx
index 9d75438..f829325 100644
--- a/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx
+++ b/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx
@@ -66,12 +66,27 @@
             </div>
         </div>
     </div>
+     <div class="row clearfix">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div class="card">
+                <div class="header">
+                    <h2>Job List</h2>
+                </div>
+                <div class="body">
+                    <table id="tblJobs" class="table table-bordered table-striped table-hover js-basic-example ">
+                    </table>
+                </div><!-- body -->
+            </div>
+        </div>
+    </div>
+    
     <script src="../Lib/Plugins/jquery/jquery.min.js"></script>
     <script src="candidate.js"></script>
     <script src="../Services/service.js"></script>
      <script>
          $(document).ready(function () {
-             
+
+             new Canidate().GetJobListing();
              //candidate.bindSkills();
          });
          let candidate = new Candidate();
diff --git a/HRManagementApp/HRManagementApp/Admin/candidate.js b/HRManagementApp/HRManagementApp/Admin/candidate.js
index a9d7b7a..f397f4d 100644
--- a/HRManagementApp/HRManagementApp/Admin/candidate.js
+++ b/HRManagementApp/HRManagementApp/Admin/candidate.js
@@ -30,21 +30,17 @@
         })
     }
     createjob() {
-        debugger
         $('#frmJobCreation').on('submit', (e, data) => {
             let arrData = $("#frmJobCreation").serializeArray();
             let objService = new Service();
             let objajax = objService.ajax("createJob", objService.POST, `{jobtitle: "${arrData[0].value}" ,skills:"${arrData[1].value}" ,noofvacancies:"${arrData[2].value}",remarks:"${arrData[3].value}"}`)
             objajax.done(function (response) {
-                //$('#tagsinput').value = "";
-                //$('#totalexperience').value = "";
-                //$('#biodata').value = "";
+                $('#tagsinput').val("");
+                $('#totalexperience').val("");
+                $('#biodata').val("");
                 console.log(response);
             });
             objajax.error(function (response) {
-                //$('#tagsinput').value = "";
-                //$('#totalexperience').value = "";
-                //$('#biodata').value = "";
                 console.log(response);
             });
             e.preventDefault();
@@ -66,5 +62,38 @@
             $(".dropdown-menu.inner")[0].innerHTML = liString
 
         });
+    }
+    GetJobListing() {
+        let objService = new Service();
+        let objajax = objService.ajax("GetTaskList", objService.POST, `{}`)
+        objajax.then(function (response) {
+            
+            let table = $("#tblJobs");
+
+            table.find("tr:gt(0)").remove();; // empty table            
+
+            table.append('<thead> <tr><th>Id</th><th>Job Title</th> <th>Skills</th><th>Experience Needed</th><th></th></tr></thead><tbody>');
+
+            for (let n of response.d) {
+                let strEditanchor = `new Tasks().editJob( '${n.JobTitle}','${n.skills}','${n.noOfVacancies}');`;
+                table.append(`<tr><td>${n.jobId}</td><td>${n.JobTitle}</td><td>${n.skills}</td><td>${n.noOfVacancies}</td><td ><a style='cursor:pointer' onclick="${strEditanchor}">Edit</a></td></tr>`);
+            }
+            table.append('</tbody>');
+            if ($.fn.dataTable.isDataTable(table) == false) {
+
+                try {
+                    $('.js-basic-example').DataTable({
+                        responsive: true
+                    });
+
+                } catch (e) {
+
+                }
+            }
+
+        });
+
+
+
     }
 }
\ No newline at end of file
diff --git a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
index 3c6bd1e..868ac3a 100644
--- a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
+++ b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
@@ -507,6 +507,7 @@ public bool createJob(string jobtitle, string skills, int noofvacancies , string
             {
                 try
                 {
+                    
                     jobpost.createDate = DateTime.Now;
                     jobpost.jobTilte = jobtitle;
                     jobpost.skills = skills;

From f259744d45020df66482cfb04878711aec3cd44d Mon Sep 17 00:00:00 2001
From: Denial Tandel <denialtandel@cakewalk.in>
Date: Sun, 28 May 2017 20:03:41 +0530
Subject: [PATCH 2/7] Change : Updated candidate skill updation

---
 .../HRManagementApp/Admin/CandidateDetails.aspx    | 14 +++-----------
 HRManagementApp/HRManagementApp/Admin/candidate.js |  7 ++++---
 .../HRManagementApp/Services/Services.asmx.cs      |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx b/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx
index a73ebd6..93f3029 100644
--- a/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx
+++ b/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx
@@ -9,26 +9,18 @@
                    Candidate Details
                 </h2>
             </div>
-
             <div class="row clearfix">
                 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                         <div class="body">
                              <form id="frmCandidateDetails">
-                                 <%--<div class="col-md-12">
-                                        <div class="form-group" >
-                                            <div class="form-line">
-                                                <select name="tagsinput" id="drpSkills" data-live-search="true" class="form-control show-tick" multiple>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>--%>
                                  <div class="col-sm-12">
                                         <label for="skills">Skills</label>
                                 </div>
                                   <div class="col-md-12">
                                         <div class="form-group" >
                                             <div class="form-line">
-                                                <select name="tagsinput"  data-live-search="true" class="form-control show-tick" multiple>
+                                                <select name="tagsinput"  id="tagsinput"  data-live-search="true" class="form-control show-tick">
+                                                <option>---Select Skill---</option>
                                                 <option>C#</option>
                                                 <option>.Net</option>
                                                 <option>ExtJs</option>
@@ -41,7 +33,7 @@
                                         <label for="nofofpositions">Total Experience</label>
                                 </div>
                                  <div class="col-sm-12">
-                                    <input type="number" class="form-control" min="1" name="totalexperience" placeholder="Number of Positions" required autofocus>
+                                    <input type="number" class="form-control" min="1" id="totalexperience" name="totalexperience" placeholder="Number of Positions" required autofocus>
                                 </div>
                                 <div class="col-sm-12">
                                         <label for="resume">Upload your Resume</label>
diff --git a/HRManagementApp/HRManagementApp/Admin/candidate.js b/HRManagementApp/HRManagementApp/Admin/candidate.js
index 213c9b3..5633800 100644
--- a/HRManagementApp/HRManagementApp/Admin/candidate.js
+++ b/HRManagementApp/HRManagementApp/Admin/candidate.js
@@ -3,6 +3,7 @@
     }
 
     updatecandidate() {
+        debugger
         $('#frmCandidateDetails').on('submit', (e, data) => {
             let arrData = $("#frmCandidateDetails").serializeArray(); 
             // Get fileuploader path 
@@ -15,9 +16,9 @@
             let objService = new Service();
             let objajax = objService.ajax("updateCandidate", objService.POST, `{skillset: "${arrData[0].value}" ,experience:"${arrData[1].value}" ,biodata:"${filename}"}`)
             objajax.done(function (response) {
-                //$('#hdRecordid').value = "";
-                //$('#totalexperience').value = "";
-                //$('#biodata').value = "";
+                $('#tagsinput').val("");
+                $('#totalexperience').val("");
+                $('#biodata').val("");
                 console.log(response);
             });
             objajax.error(function (response) {
diff --git a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
index 56ab03b..33923b1 100644
--- a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
+++ b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
@@ -392,7 +392,7 @@ public bool updateCandidate(string skillset, int experience, string biodata)
         {
             bool flagSucess = false;
             int userId = 0;
-            if (Session["user"] != null)
+            if (Session["adminuser"] != null)
             {
 
                 string currentUser = Session["adminuser"].ToString();

From 6949550fd3b4926314896003dbb7fa64181aaf0e Mon Sep 17 00:00:00 2001
From: Soheb Rapati <soheb@cakewalk.in>
Date: Sun, 28 May 2017 20:34:31 +0530
Subject: [PATCH 3/7] Update candidatemaster page

---
 HRManagementApp/HRManagementApp/User/candidateDashboard.Master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HRManagementApp/HRManagementApp/User/candidateDashboard.Master b/HRManagementApp/HRManagementApp/User/candidateDashboard.Master
index 827daf0..c8b4089 100644
--- a/HRManagementApp/HRManagementApp/User/candidateDashboard.Master
+++ b/HRManagementApp/HRManagementApp/User/candidateDashboard.Master
@@ -314,7 +314,7 @@
             <div class="menu">
                 <ul class="list">                    
                     <li class="active">
-                        <a href="index.html">
+                        <a href="default.aspx">
                             <i class="material-icons">home</i>
                             <span>Careers</span>
                         </a>

From 84898193f9994cfe85d29ca309f70386e46f8629 Mon Sep 17 00:00:00 2001
From: Soheb Rapati <soheb@cakewalk.in>
Date: Sun, 28 May 2017 20:48:29 +0530
Subject: [PATCH 4/7] Change Logout

---
 .../HRManagementApp/Admin/Dashboard.Master    | 20 ++++++++++++++++---
 .../HRManagementApp/Admin/Dashboard.Master.cs |  2 +-
 .../User/candidateDashboard.Master            | 14 ++++++-------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/HRManagementApp/HRManagementApp/Admin/Dashboard.Master b/HRManagementApp/HRManagementApp/Admin/Dashboard.Master
index 6cc1ce1..b5a63ef 100644
--- a/HRManagementApp/HRManagementApp/Admin/Dashboard.Master
+++ b/HRManagementApp/HRManagementApp/Admin/Dashboard.Master
@@ -294,14 +294,22 @@
                     <!-- #END# Tasks -->
 
                     <!-- User Setting -->
-                    <li class="dropdown">
+                    <%--<li class="dropdown">
                         <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button">
                             <i class="material-icons">person</i>                            
                         </a>
-                    </li>
+                    </li>--%>
                     <!-- #END# User Setting -->
 
-                    <li class="pull-right"><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li>
+                    <li class="dropdown">
+                            <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                                <i class="material-icons">person</i>
+                            </a>
+                            <ul class="dropdown-menu pull-right">
+                                <li><a href="javascript:void(0);">Account Setting</a></li>
+                                <li><a href="Login.aspx">Logout</a></li>                                
+                            </ul>
+                    </li>
                 </ul>
             </div>
         </div>
@@ -331,6 +339,12 @@
                             <span>Employee Project Management</span>
                         </a>
                     </li>
+                    <li>
+                        <a href="UserSignup.aspx">
+                            <i class="material-icons">person</i>
+                            <span>User Management</span>
+                        </a>
+                    </li>
                     <li>
                         <a href="Tasks.aspx">
                             <i class="material-icons">description</i>
diff --git a/HRManagementApp/HRManagementApp/Admin/Dashboard.Master.cs b/HRManagementApp/HRManagementApp/Admin/Dashboard.Master.cs
index 6bc20ee..ac6f5d1 100644
--- a/HRManagementApp/HRManagementApp/Admin/Dashboard.Master.cs
+++ b/HRManagementApp/HRManagementApp/Admin/Dashboard.Master.cs
@@ -7,7 +7,7 @@
 
 namespace HRManagementApp.Admin
 {
-    public partial class Dashboard : BaseAdminPage
+    public partial class Dashboard : System.Web.UI.MasterPage
     {
         protected void Page_Load(object sender, EventArgs e)
         {
diff --git a/HRManagementApp/HRManagementApp/User/candidateDashboard.Master b/HRManagementApp/HRManagementApp/User/candidateDashboard.Master
index c8b4089..03e5bed 100644
--- a/HRManagementApp/HRManagementApp/User/candidateDashboard.Master
+++ b/HRManagementApp/HRManagementApp/User/candidateDashboard.Master
@@ -293,15 +293,15 @@
                     </li>
                     <!-- #END# Tasks -->
 
-                    <!-- User Setting -->
                     <li class="dropdown">
-                        <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button">
-                            <i class="material-icons">person</i>                            
-                        </a>
+                            <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                                <i class="material-icons">person</i>
+                            </a>
+                            <ul class="dropdown-menu pull-right">
+                                <li><a href="javascript:void(0);">Account Setting</a></li>
+                                <li><a href="Signin.aspx">Logout</a></li>                                
+                            </ul>
                     </li>
-                    <!-- #END# User Setting -->
-
-                    <li class="pull-right"><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li>
                 </ul>
             </div>
         </div>

From 82bcf7ff48a9d25b005f5b0d1433b111fba2db64 Mon Sep 17 00:00:00 2001
From: Sumit Patel <sumitmpatel@gmail.com>
Date: Tue, 30 May 2017 13:38:19 +0530
Subject: [PATCH 5/7] add condition for active jobs only

---
 HRManagementApp/HRManagementApp/Services/Services.asmx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
index a2f8b84..fcca3f0 100644
--- a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
+++ b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs
@@ -560,7 +560,7 @@ public string GetJobs()
             {
                 using (HREntities db = new HREntities())
                 {
-                    var data = db.jobPosts.ToList();
+                    var data = db.jobPosts.Where(x=>x.isActive==true).ToList();
                     jobPost obj = new jobPost();
                     return JsonConvert.SerializeObject(data);
                 }

From 12370c6d7a6887299ccb04779bb14d0b86c372cd Mon Sep 17 00:00:00 2001
From: Soheb Rapati <soheb@cakewalk.in>
Date: Tue, 7 Jan 2020 21:15:29 +0530
Subject: [PATCH 6/7] Update package.json

---
 .../HRManagementApp/Lib/Plugins/morrisjs/package.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json b/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json
index 529c2b1..51c1dd1 100644
--- a/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json
+++ b/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json
@@ -25,7 +25,7 @@
     "grunt-contrib-less": "~0.7.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-shell": "~0.5.0",
-    "bower": "~1.2.8"
+    //"bower": "~1.2.8"
   },
   "scripts": {
     "test": "grunt concat coffee mocha"

From d3b0f8a5bd8d4afc5a35775fb82fa55e6e25f248 Mon Sep 17 00:00:00 2001
From: Soheb Rapati <soheb@cakewalk.in>
Date: Tue, 7 Jan 2020 21:16:06 +0530
Subject: [PATCH 7/7] Update package.json

---
 .../HRManagementApp/Lib/Plugins/morrisjs/package.json            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json b/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json
index 51c1dd1..91cb6f7 100644
--- a/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json
+++ b/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json
@@ -25,7 +25,6 @@
     "grunt-contrib-less": "~0.7.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-shell": "~0.5.0",
-    //"bower": "~1.2.8"
   },
   "scripts": {
     "test": "grunt concat coffee mocha"