Skip to content
Snippets Groups Projects
Commit cd4a1a7f authored by Ye Tian's avatar Ye Tian
Browse files

little changes on empty alert of page split and confirm of process requests

parent 7db3d577
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
web/index.html
+ 58
− 58
View file @ cd4a1a7f
...@@ -39,70 +39,70 @@ ...@@ -39,70 +39,70 @@
</div> </div>
</div> </div>
<div class="topbar"> <!--<div class="topbar">-->
<nav class="top-navbar"> <!-- <nav class="top-navbar">-->
<div class="navbar-header"> <!-- <div class="navbar-header">-->
<span>Easy Eportfolio</span> <!-- <span>Easy Eportfolio</span>-->
</div> <!-- </div>-->
<div class="nav-right"> <!-- <div class="nav-right">-->
<div class="collapse navbar-collapse nav-list"> <!-- <div class="collapse navbar-collapse nav-list">-->
<ul class="navbar-nav ml-auto" style="list-style:none;"> <!-- <ul class="navbar-nav ml-auto" style="list-style:none;">-->
<li class="nav-item dropdown"> <!-- <li class="nav-item dropdown">-->
<a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" <!-- <a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"-->
aria-expanded="false" href=""><i class="fa fa-user"></i></a > <!-- aria-expanded="false" href=""><i class="fa fa-user"></i></a >-->
<ul class="dropdown-menu"> <!-- <ul class="dropdown-menu">-->
<li><a class="nav-link" href="person.html">View Profile</a ></li> <!-- <li><a class="nav-link" href="person.html">View Profile</a ></li>-->
<li><a class="nav-link" href="admin.html">My Admin</a ></li> <!-- <li><a class="nav-link" href="admin.html">My Admin</a ></li>-->
<li><a class="nav-link" href="#" style="border-top: 1px solid #b1b8bb"><i class="fa fa-power-off"></i> Log Out</a ></li> <!-- <li><a class="nav-link" href="#" style="border-top: 1px solid #b1b8bb"><i class="fa fa-power-off"></i> Log Out</a ></li>-->
</ul> <!-- </ul>-->
</li> <!-- </li>-->
<li class="nav-item active"><a class="nav-link" href="index.html"><i class="fa fa-home"></i></a ></li> <!-- <li class="nav-item active"><a class="nav-link" href="index.html"><i class="fa fa-home"></i></a ></li>-->
</ul> <!-- </ul>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</nav> <!-- </nav>-->
</div> <!--</div>-->
<div class="main-wrapper oh"> <div class="main-wrapper oh">
<!--<header class="nav-type-1 dark-nav">--> <header class="nav-type-1 dark-nav">
<!--<nav class="navbar navbar-fixed-top">--> <nav class="navbar navbar-fixed-top">
<!--<div class="navigation">--> <div class="navigation">
<!--<div class="container relative">--> <div class="container relative">
<!--<div class="row">--> <div class="row">
<!--<div class="navbar-header">--> <div class="navbar-header">
<!--<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">--> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
<!--<span class="sr-only">Toggle navigation</span>--> <span class="sr-only">Toggle navigation</span>
<!--<span class="icon-bar"></span>--> <span class="icon-bar"></span>
<!--<span class="icon-bar"></span>--> <span class="icon-bar"></span>
<!--<span class="icon-bar"></span>--> <span class="icon-bar"></span>
<!--</button>--> </button>
<!--</div> &lt;!&ndash; end navbar-header &ndash;&gt;--> </div> <!-- end navbar-header -->
<!--&lt;!&ndash; side menu &ndash;&gt;-->
<!--<div class="side-menu right mobile-left-align">-->
<!--<div class="nav-inner menu-socials social-icons">-->
<!--<div class="right">-->
<!--<button id="loginbtn" class="launch-modal" data-modal-id="modal-login" onclick="clearTips()"><i class="fa fa-user fa-2x"></i></button>-->
<!--&lt;!&ndash; <a href="#" id="toHomepage" onclick="openHomepage()" style="color: #2b669a">HomePageeeeeeeee</a>&ndash;&gt;-->
<!--<button id="toHomepage" onclick="openHomepage()" ><img id="myPhoto" src="" style="height: 30px;width: 30px"></img></button>-->
<!--<a href="#" id="logout" onclick="logout()" style="color: #2b669a">Logout</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>--> <!-- side menu -->
<!--</div>--> <div class="side-menu right mobile-left-align">
<!--</div>--> <div class="nav-inner menu-socials social-icons">
<!--</nav>--> <div class="right">
<!--</header>--> <button id="loginbtn" class="launch-modal" data-modal-id="modal-login" onclick="clearTips()"><i class="fa fa-user fa-2x"></i></button>
<!-- <a href="#" id="toHomepage" onclick="openHomepage()" style="color: #2b669a">HomePageeeeeeeee</a>-->
<button id="toHomepage" onclick="openHomepage()" ><img id="myPhoto" src="" style="height: 30px;width: 30px"></img></button>
<a href="#" id="logout" onclick="logout()" style="color: #2b669a">Logout</a>
</div>
</div>
</div>
</div>
</div>
</div>
</nav>
</header>
<section class="header-wrap hero-section bg-light"> <section class="header-wrap hero-section bg-light">
<div class="container"> <div class="container">
......
web/js/Privacy/request.js
+ 55
− 53
View file @ cd4a1a7f
...@@ -20,26 +20,11 @@ function getReqeustedProjects(){ ...@@ -20,26 +20,11 @@ function getReqeustedProjects(){
dataType: 'json', dataType: 'json',
success: function(data){ success: function(data){
console.log(data); console.log(data);
// for(x in data){ if(data==null || data.length==0){
// var projectId = data[x].projectid; //project id留作备用 $("#requestProjectList").append('<h4>No request.</h4>');
// $("#requestProjectList").append(' <li>\n' + } else{
// ' <div class="req-in">\n' +
// ' <div class="proj-des">\n' +
// ' <h3><a href="person-project.html?id='+data[x].projectid+'">' + data[x].projectname + '</a></h3>\n' +
// ' <h5>' + data[x].projectdescription + '</h5>\n' +
// ' </div>\n' +
// ' <div class="req-des">\n' +
// ' <span>Total number of Applicants: ' + data[x].countrequest + '</span>\n' +
// ' <div class="req-button">\n' +
// ' <a href="#project=' + data[x].projectname + '"><button class="candidate" onclick="loadCandidates('+data[x].projectid+')">See applicants</button></a>\n' +
// ' <button class="agree" onclick="agreeAll('+projectId+')">Agree all</button>\n' +
// ' </div>\n' +
// ' </div>\n' +
// ' </div>\n' +
// ' </li>');
// }
loadSubPage(data, 1); loadSubPage(data, 1);
}
}, },
error : function(msg) { error : function(msg) {
alert("get projects failed"); alert("get projects failed");
...@@ -261,7 +246,17 @@ function submitSelections(){ ...@@ -261,7 +246,17 @@ function submitSelections(){
if(v == "yes") acceptUsers += userId+","; if(v == "yes") acceptUsers += userId+",";
else refuseUsers += userId+","; else refuseUsers += userId+",";
} }
if(confirm("Sure to submit?")){ $.confirm({
title: 'Sure to submit?',
content: '',
icon: 'fa fa-warning',
theme: 'white',
buttons: {
ok: {
text: "ok",
btnClass: 'btn-primary',
keys: ['enter'],
action: function() {
if(acceptUsers.length != 0){ if(acceptUsers.length != 0){
//alert("accepter user: "+acceptUsers); //alert("accepter user: "+acceptUsers);
processRequest(projectId, acceptUsers, 2); processRequest(projectId, acceptUsers, 2);
...@@ -275,6 +270,28 @@ function submitSelections(){ ...@@ -275,6 +270,28 @@ function submitSelections(){
loadCandidates(projectId); loadCandidates(projectId);
} }
} }
},
cancel: function(){
console.log('the user clicked cancel');
}
}
});
// if(confirm("Sure to submit?")){
// if(acceptUsers.length != 0){
// //alert("accepter user: "+acceptUsers);
// processRequest(projectId, acceptUsers, 2);
// setVisibleTo(projectId, acceptUsers);
// }
// if(refuseUsers.length != 0){
// //alert("refuse user: "+refuseUsers);
// processRequest(projectId, refuseUsers, 1);
// }
// if(projectId != -1){
// loadCandidates(projectId);
// }
// }
} }
//Requests sent by myself //Requests sent by myself
...@@ -293,26 +310,11 @@ function getMyRequests(){ ...@@ -293,26 +310,11 @@ function getMyRequests(){
dataType: 'json', dataType: 'json',
success: function(data){ success: function(data){
console.log(data); console.log(data);
// for(x in data){ if(data==null || data.length==0){
// var statusNum = data[x].requeststatus; $("#myRequestsList").append('<h4>No request.</h4>');
// var status = "Unhandled"; } else{
// if(statusNum == '1') status = "Refused";
// else if(statusNum == '2') status = "Approved";
// $("#myRequestsList").append(' <li>\n' +
// ' <div class="req-in">\n' +
// ' <div class="req-detail">\n' +
// ' <span style="font-size: x-large; ">'+data[x].projectname+'</span>\n' +
// ' <h4>Project Owner: <a href="other-person.html?id='+data[x].userid+'">'+data[x].name+'</a> Apply date: '+data[x].str_requesttime+'</h4>\n' +
// ' </div>\n' +
// ' <div class="req-status">\n' +
// ' <span>Status:</span>\n' +
// ' <span class="status">'+status+'</span>\n' +
// ' </div>\n' +
// ' <div class="req-btn"><input type="button" onclick="deleteRequest('+data[x].requestid+')" value="DELETE"/></div>' +
// ' </div>\n' +
// ' </li>');
// }
loadSubPage(data, 2); loadSubPage(data, 2);
}
}, },
error : function(msg) { error : function(msg) {
alert("get my requests failed"); alert("get my requests failed");
......
web/webpage/privacy/privacy-candidate.html
+ 3
− 9
View file @ cd4a1a7f
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<script src="../../js/jquery.min.js"> </script> <script src="../../js/jquery.min.js"> </script>
<script src="../../js/bootstrap.min.js"> </script> <script src="../../js/bootstrap.min.js"> </script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.0/jquery-confirm.min.css">
<!-- Custom and plugin javascript --> <!-- Custom and plugin javascript -->
<link href="../../css/custom.css" rel="stylesheet"> <link href="../../css/custom.css" rel="stylesheet">
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
<script src="/js/Privacy/privacy_set.js"></script> <script src="/js/Privacy/privacy_set.js"></script>
<script src="/js/Privacy/request.js"></script> <script src="/js/Privacy/request.js"></script>
<script src="js/jquery-confirm.js"></script>
<script> <script>
$(function(){ $(function(){
...@@ -68,15 +70,7 @@ ...@@ -68,15 +70,7 @@
<nav aria-label="Page navigation example" class="m-t-40"> <nav aria-label="Page navigation example" class="m-t-40">
<ul class="pagination" id="page-bar"> <ul class="pagination" id="page-bar">
<!-- <li class="page-item disabled">--> <!-- Page bar tools -->
<!-- <a class="page-link" href="#" tabindex="-1">Previous</a>-->
<!-- </li>-->
<!-- <li class="page-item"><a class="page-link" href="#">1</a></li>-->
<!-- <li class="page-item"><a class="page-link" href="#">2</a></li>-->
<!-- <li class="page-item"><a class="page-link" href="#">3</a></li>-->
<!-- <li class="page-item">-->
<!-- <a class="page-link" href="#">Next</a>-->
<!-- </li>-->
</ul> </ul>
</nav> </nav>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment