diff --git a/web/index.html b/web/index.html
index c6ea3607f57511b1197e92d2cbd5638998594b7a..89874af9cfa3220dd23d0628f3f86644f088545c 100644
--- a/web/index.html
+++ b/web/index.html
@@ -39,70 +39,70 @@
</div>
</div>
-<div class="topbar">
- <nav class="top-navbar">
- <div class="navbar-header">
- <span>Easy Eportfolio</span>
- </div>
+<!--<div class="topbar">-->
+<!-- <nav class="top-navbar">-->
+<!-- <div class="navbar-header">-->
+<!-- <span>Easy Eportfolio</span>-->
+<!-- </div>-->
+
+<!-- <div class="nav-right">-->
+<!-- <div class="collapse navbar-collapse nav-list">-->
+<!-- <ul class="navbar-nav ml-auto" style="list-style:none;">-->
+<!-- <li class="nav-item dropdown">-->
+<!-- <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 >-->
+<!-- <ul class="dropdown-menu">-->
+<!-- <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="#" style="border-top: 1px solid #b1b8bb"><i class="fa fa-power-off"></i> Log Out</a ></li>-->
+<!-- </ul>-->
+<!-- </li>-->
+<!-- <li class="nav-item active"><a class="nav-link" href="index.html"><i class="fa fa-home"></i></a ></li>-->
+<!-- </ul>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </nav>-->
+<!--</div>-->
- <div class="nav-right">
- <div class="collapse navbar-collapse nav-list">
- <ul class="navbar-nav ml-auto" style="list-style:none;">
- <li class="nav-item dropdown">
- <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 >
- <ul class="dropdown-menu">
- <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="#" style="border-top: 1px solid #b1b8bb"><i class="fa fa-power-off"></i> Log Out</a ></li>
- </ul>
- </li>
- <li class="nav-item active"><a class="nav-link" href="index.html"><i class="fa fa-home"></i></a ></li>
- </ul>
- </div>
- </div>
+<div class="main-wrapper oh">
- </nav>
-</div>
+ <header class="nav-type-1 dark-nav">
-<div class="main-wrapper oh">
+ <nav class="navbar navbar-fixed-top">
+ <div class="navigation">
+ <div class="container relative">
- <!--<header class="nav-type-1 dark-nav">-->
-
- <!--<nav class="navbar navbar-fixed-top">-->
- <!--<div class="navigation">-->
- <!--<div class="container relative">-->
-
- <!--<div class="row">-->
-
- <!--<div class="navbar-header">-->
- <!--<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">-->
- <!--<span class="sr-only">Toggle navigation</span>-->
- <!--<span class="icon-bar"></span>-->
- <!--<span class="icon-bar"></span>-->
- <!--<span class="icon-bar"></span>-->
- <!--</button>-->
- <!--</div> <!– end navbar-header –>-->
-
-
- <!--<!– side menu –>-->
- <!--<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>-->
-<!--<!– <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 class="row">
- <!--</div>-->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div> <!-- end navbar-header -->
+
+
+ <!-- side menu -->
+ <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>
+<!-- <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>-->
- <!--</nav>-->
- <!--</header>-->
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </nav>
+ </header>
<section class="header-wrap hero-section bg-light">
<div class="container">
diff --git a/web/js/Privacy/request.js b/web/js/Privacy/request.js
index 87d7aaf6fb92421a5ec2c9b5f0e3225145df2dbb..83bab1483b86f72c5e59455814c3cb97854cbd2b 100644
--- a/web/js/Privacy/request.js
+++ b/web/js/Privacy/request.js
@@ -20,26 +20,11 @@ function getReqeustedProjects(){
dataType: 'json',
success: function(data){
console.log(data);
- // for(x in data){
- // var projectId = data[x].projectid; //project id留作备用
- // $("#requestProjectList").append(' <li>\n' +
- // ' <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);
+ if(data==null || data.length==0){
+ $("#requestProjectList").append('<h4>No request.</h4>');
+ } else{
+ loadSubPage(data, 1);
+ }
},
error : function(msg) {
alert("get projects failed");
@@ -261,20 +246,52 @@ function submitSelections(){
if(v == "yes") acceptUsers += userId+",";
else refuseUsers += userId+",";
}
- 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);
+ $.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){
+ //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);
+ }
+ }
+ },
+ 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
@@ -293,26 +310,11 @@ function getMyRequests(){
dataType: 'json',
success: function(data){
console.log(data);
- // for(x in data){
- // var statusNum = data[x].requeststatus;
- // var status = "Unhandled";
- // 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);
+ if(data==null || data.length==0){
+ $("#myRequestsList").append('<h4>No request.</h4>');
+ } else{
+ loadSubPage(data, 2);
+ }
},
error : function(msg) {
alert("get my requests failed");
diff --git a/web/webpage/privacy/privacy-candidate.html b/web/webpage/privacy/privacy-candidate.html
index 47adf3f3fd34a61841bc76f5dc8f59936079fc06..3f3c0259810b003bd0502c405da1bf5be6bedc19 100644
--- a/web/webpage/privacy/privacy-candidate.html
+++ b/web/webpage/privacy/privacy-candidate.html
@@ -14,6 +14,7 @@
<script src="../../js/jquery.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 -->
<link href="../../css/custom.css" rel="stylesheet">
@@ -24,6 +25,7 @@
<script src="/js/Privacy/privacy_set.js"></script>
<script src="/js/Privacy/request.js"></script>
+ <script src="js/jquery-confirm.js"></script>
<script>
$(function(){
@@ -68,15 +70,7 @@
<nav aria-label="Page navigation example" class="m-t-40">
<ul class="pagination" id="page-bar">
- <!-- <li class="page-item disabled">-->
- <!-- <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>-->
+ <!-- Page bar tools -->
</ul>
</nav>