diff --git a/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx b/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx index 38f8447..a530a33 100644 --- a/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx +++ b/HRManagementApp/HRManagementApp/Admin/CandidateDetails.aspx @@ -9,26 +9,18 @@ Candidate Details -
- <%--
-
-
- -
-
-
--%>
- + @@ -41,7 +33,7 @@
- +
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 @@ -
  • + <%--
  • person -
    • + --%> -
  • more_vert
    • +
  • + + +
    • @@ -331,6 +339,12 @@ Employee Project Management +
  • + + person + User Management + +
  • description 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/Admin/JobCreate.aspx b/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx index 565e80c..37bce04 100644 --- a/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx +++ b/HRManagementApp/HRManagementApp/Admin/JobCreate.aspx @@ -2,6 +2,7 @@ +
    @@ -13,11 +14,11 @@
    - +
    - +
    @@ -32,11 +33,11 @@
    --%>
    -
    +
    - @@ -47,34 +48,57 @@
    -
    +
    - +
    - +
    - + <%--
    + + +
    --%> +
    +
    + +
    + +
    +
    - +
    +
    +
    +
    +
    +
    +

    Job List

    +
    +
    + +
    +
    +
    +
    +
    +
    diff --git a/HRManagementApp/HRManagementApp/Admin/candidate.js b/HRManagementApp/HRManagementApp/Admin/candidate.js index f356ad4..6e3b8bf 100644 --- a/HRManagementApp/HRManagementApp/Admin/candidate.js +++ b/HRManagementApp/HRManagementApp/Admin/candidate.js @@ -3,9 +3,11 @@ } updatecandidate() { + debugger $('#frmCandidateDetails').on('submit', (e, data) => { let arrData = $("#frmCandidateDetails").serializeArray(); // Get fileuploader path + //let hrid = $('#hdRecordid').val(); let filename = ''; let biodata = document.getElementById("biodata"); if (biodata) { @@ -14,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((response)=> { - //$('#tagsinput').value = ""; - //$('#totalexperience').value = ""; - //$('#biodata').value = ""; + $('#tagsinput').val(""); + $('#totalexperience').val(""); + $('#biodata').val(""); console.log(response); }); objajax.error( (response) =>{ @@ -30,26 +32,25 @@ }) } 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((response)=> { - //$('#tagsinput').value = ""; - //$('#totalexperience').value = ""; - //$('#biodata').value = ""; - console.log(response); - }); - objajax.error((response)=> { - //$('#tagsinput').value = ""; - //$('#totalexperience').value = ""; - //$('#biodata').value = ""; - console.log(response); - }); - e.preventDefault(); - return false; - }) + let jobtitle = $("#jobtitle"); + let skills = $("#skills") + let noofpositions = $("#noofpositions"); + let requirements = $("#requirements"); + let isActive = $('#isactive')[0].checked + let hrid = $('#hdRecordid').val(); + let data = `{recordid: "${hrid}" ,jobtitle: "${jobtitle.val()}" ,skills:"${skills.val()}" ,noofvacancies:"${noofpositions.val()}",remarks:"${requirements.val()}",isActive:${isActive}}` + let objService = new Service(); + + let objajax = objService.ajax("createJob", objService.POST, data) + objajax.done((response) => { + $('#jobtitle').val(""); + $('#skills').val(""); + $('#requirements').val(""); + $('#noofpositions').val(""); + new Candidate().GetJobListing() + console.log(response); + }); + } bindSkills() { let objService = new Service(); @@ -67,4 +68,59 @@ }); } + GetJobListing() { + let objService = new Service(); + let objajax = objService.ajax("GetJobs", objService.POST, `{}`) + objajax.then((response)=> { + + let table = $("#tblJobs"); + + table.find("tr:gt(0)").remove();; // empty table + + table.append(' IdJob Title SkillsExperience Needed'); + var data = JSON.parse(response.d); + for (let n of data) { + let strEditanchor = `new Candidate().editJob( '${n.jobId}','${n.jobTilte}','${n.skills}','${n.noOfVacancies}','${n.remarks}','${n.isActive}');`; + table.append(`${n.jobId}${n.jobTilte}${n.skills}${n.noOfVacancies}    Edit`); + } + table.append(''); + if ($.fn.dataTable.isDataTable(table) == false) { + + try { + $('.js-basic-example').DataTable({ + responsive: true + }); + + } catch (e) { + + } + } + + }); + } + editJob(jobid, jobtitle, skills, noofpositions, descriptions, isactive) { + + let hdEdit = $("#hdRecordid"); + let txtjobtitle = $('#jobtitle'); + let txtskills = $('#skills'); + let txtrequirements = $('#requirements'); + let txtnoofpositions = $('#noofpositions'); + let chkIsActive = $('#isactive')[0]; + + isactive = (isactive === 'true'); + hdEdit.val(jobid); + txtjobtitle.val(jobtitle); + txtskills.val(skills); + txtnoofpositions.val(noofpositions); + txtrequirements.val(descriptions); + chkIsActive.checked = isactive; + + + txtjobtitle.focus(); + + txtskills.focus(); + + txtnoofpositions.focus(); + txtrequirements.focus(); + } } \ No newline at end of file diff --git a/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json b/HRManagementApp/HRManagementApp/Lib/Plugins/morrisjs/package.json index 529c2b1..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" diff --git a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs index 3dc010c..fcca3f0 100644 --- a/HRManagementApp/HRManagementApp/Services/Services.asmx.cs +++ b/HRManagementApp/HRManagementApp/Services/Services.asmx.cs @@ -249,8 +249,6 @@ public bool SaveTask(string Taskname, string gitUrl, int timeTaken, string recor d.taskName = Taskname; d.gitUrl = gitUrl; d.timeTaken = timeTaken; - - } } @@ -396,7 +394,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(); @@ -492,9 +490,10 @@ public string moduleList() return JsonConvert.SerializeObject(moduleList); } [WebMethod(EnableSession = true)] - public bool createJob(string jobtitle, string skills, int noofvacancies, string remarks) + public bool createJob(string recordid, string jobtitle, string skills, int noofvacancies, string remarks, bool isActive) { bool flagSucess = false; + //bool isActiveTest = true; int userId = 0; if (Session["adminuser"] != null) { @@ -507,22 +506,41 @@ public bool createJob(string jobtitle, string skills, int noofvacancies, string } } - jobPost jobpost = new jobPost(); + + using (HREntities db = new HREntities()) { + try { - jobpost.createDate = DateTime.Now; - jobpost.jobTilte = jobtitle; - jobpost.skills = skills; - jobpost.noOfVacancies = noofvacancies; - jobpost.remarks = remarks; - jobpost.userId = userId; - jobpost.isActive = true; + jobPost jobpost = new jobPost(); + if (recordid == "") + { + jobpost.createDate = DateTime.Now; + jobpost.jobTilte = jobtitle; + jobpost.skills = skills; + jobpost.noOfVacancies = noofvacancies; + jobpost.remarks = remarks; + jobpost.userId = userId; + jobpost.isActive = isActive; + db.jobPosts.Add(jobpost); - db.jobPosts.Add(jobpost); - db.SaveChanges(); + } + else { + + long id = long.Parse(recordid); + jobpost = db.jobPosts.Where(x => x.jobId == id).SingleOrDefault(); + jobpost.createDate = DateTime.Now; + jobpost.jobTilte = jobtitle; + jobpost.skills = skills; + jobpost.noOfVacancies = noofvacancies; + jobpost.remarks = remarks; + jobpost.userId = userId; + jobpost.isActive = isActive; + + } flagSucess = true; + db.SaveChanges(); } catch (Exception) { @@ -542,7 +560,8 @@ 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); } } diff --git a/HRManagementApp/HRManagementApp/User/candidateDashboard.Master b/HRManagementApp/HRManagementApp/User/candidateDashboard.Master index 827daf0..03e5bed 100644 --- a/HRManagementApp/HRManagementApp/User/candidateDashboard.Master +++ b/HRManagementApp/HRManagementApp/User/candidateDashboard.Master @@ -293,15 +293,15 @@
    • -
  • - - person - + +
    • - - -
  • more_vert
    • @@ -314,7 +314,7 @@