diff --git a/src/jdbc.properties b/src/jdbc.properties
index a2bb72ec91697819fe3891f07a700674c3b450a3..9314c2dd98fa7e820fb3e7de66119d5edfa76064 100644
--- a/src/jdbc.properties
+++ b/src/jdbc.properties
@@ -1,4 +1,4 @@
url=jdbc:mysql://localhost:3306/eportfolio_database?useUnicode=true&characterEncoding=utf-8&useSSL=false
user=root
-password=1234
+password=root
driver=com.mysql.jdbc.Driver
\ No newline at end of file
diff --git a/web/js/Project/project_display.js b/web/js/Project/project_display.js
index c529133276b5cd4bd5b1045310040c08e26de2ea..5bb5937067af769ae536eb1c4f02c2875f5bb2c6 100644
--- a/web/js/Project/project_display.js
+++ b/web/js/Project/project_display.js
@@ -2,14 +2,17 @@
//全局变量：当前登录用户的id
var strcookie = document.cookie;
-var userIdStr = strcookie.split(";")[0];
-var userId = userIdStr.split("=")[1];
+var userId = 0;
+if(strcookie.length > 0){
+ var userIdStr = strcookie.split(";")[0];
+ userId = userIdStr.split("=")[1];
+}
//全局变量: 选中用户的id，可能为0
var url = window.location.href;
var urlArray = url.split("id=");
var otheruserId = 0;
-if(urlArray.length > 0) otheruserId = url.split("id=")[1].split("#")[0];
+if(urlArray.length > 1) otheruserId = urlArray[1].split("#")[0];
//加载当前登录用户的project列表
function getMyProjectList(){
diff --git a/web/js/ToolBar/pagebar.js b/web/js/ToolBar/pagebar.js
index c347ce4f960e5c15126d90903ab0b91ea53c7454..46c17ad19d4948f329987d3c27bf7052b21f0c18 100644
--- a/web/js/ToolBar/pagebar.js
+++ b/web/js/ToolBar/pagebar.js
@@ -1,5 +1,11 @@
-loadSubPage = function(data){
- var pageSize = 5;
+/**
+ * 自定义参数
+ * @param data 所有条Json数据
+ * @param type 1：加载request里的project列表
+ * 2: 加载当前用户发送的request列表
+ */
+loadSubPage = function(data, type){
+ var pageSize = 1;
var pageNum = Math.ceil(data.length/pageSize);
var dataStr = JSON.stringify(data);
@@ -8,39 +14,39 @@ loadSubPage = function(data){
} else{
$("#page-bar").append('<div id="currentPage" style="display: none"></div>'); //用来存放当前页面编号
$("#page-bar").append("<li id='previousBtn' class='page-item disabled'>\n" +
- " <a class='page-link' href='#' tabindex='-1' onclick='changePage("+"-1,"+dataStr+","+i+","+pageSize+","+pageNum+")'>Previous</a>\n" +
+ " <a class='page-link' href='#' tabindex='-1' onclick='changePage("+"-1,"+dataStr+","+i+","+pageSize+","+pageNum+","+type+")'>Previous</a>\n" +
" </li>");
for(var i=1; i<=pageNum; i++){
// $("#page-bar").append("<li class='page-item'><a class='page-link' onclick='loadParticularPage("+dataStr+","+i+","+pageSize+","+pageNum+",\""+idStr+",\""+htmlStr+"\")' href='#'>"+i+"</a></li>");
- $("#page-bar").append("<li class='page-item' id='subpage"+i+"'><a class='page-link' onclick='loadParticularPage("+dataStr+","+i+","+pageSize+","+pageNum+")' href='#'>"+i+"</a></li>");
+ $("#page-bar").append("<li class='page-item' id='subpage"+i+"'><a class='page-link' onclick='loadParticularPage("+dataStr+","+i+","+pageSize+","+pageNum+","+type+")' href='#'>"+i+"</a></li>");
// $("#page-bar").append('<li class="page-item">' +
// // '<a class="page-link" href="#" onclick="test(\''+data+'\')">'+i+'</a></li>');
}
$("#page-bar").append("<li id='nextBtn' class='page-item'>\n" +
- " <a class='page-link' href='#' tabindex='1' onclick='changePage("+"1,"+dataStr+","+i+","+pageSize+","+pageNum+")'>Next</a>\n" +
+ " <a class='page-link' href='#' tabindex='1' onclick='changePage("+"1,"+dataStr+","+i+","+pageSize+","+pageNum+","+type+")'>Next</a>\n" +
" </li>");
- loadParticularPage(data, 1, pageSize, pageNum);
+ loadParticularPage(data, 1, pageSize, pageNum, type);
}
}
-function changePage(move, dataStr, p, pageSize, pageNum){
+function changePage(move, dataStr, p, pageSize, pageNum, type){
var curPage = $("#currentPage").html();
var newPage = parseInt(curPage)+move;
if(newPage>0 && newPage<=pageNum){
- loadParticularPage(dataStr, newPage, pageSize, pageNum);
+ loadParticularPage(dataStr, newPage, pageSize, pageNum, type);
}
}
-function loadParticularPage(dataStr, p, pageSize, pageNum) {
+function loadParticularPage(dataStr, p, pageSize, pageNum, type) {
var data = eval(dataStr);
- //清空原先列表
- $("#requestProjectList").html("");
+ // //清空原先列表
+ // $("#requestProjectList").html("");
- //记录当前页
+ //记录当前页的标号
$("#currentPage").html(p);
//样式准备
@@ -57,23 +63,49 @@ function loadParticularPage(dataStr, p, pageSize, pageNum) {
//加载数据显示列表
var start = (parseInt(p)-1)*pageSize;
- for(var x=start; x<start+pageSize; x++){
- 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>');
+
+ if(type == 1){
+ //清空原先列表
+ $("#requestProjectList").html("");
+ for(var x=start; x<start+pageSize; x++){
+ 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>');
+ }
+ } else if(type == 2){
+ $("#myRequestsList").html("");
+ for(var x=start; x<start+pageSize; x++){
+ 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>');
+ }
}
}
\ No newline at end of file
diff --git a/web/js/login_registerScripts.js b/web/js/login_registerScripts.js
index ab74741b5f0e4c791770569b1dbc391c6a74d418..f14f957ecda6f7cb9fc232440fe3cf53b0f7f891 100644
--- a/web/js/login_registerScripts.js
+++ b/web/js/login_registerScripts.js
@@ -106,8 +106,8 @@ function register(){
dataType: 'text',
success: function(data){
if(data == "success"){
- //window.location.href="register.jsp";
- alert("注册成功，换成要跳转的页面");
+ window.location.href="index.html";
+ //alert("注册成功，换成要跳转的页面");
} else{
$("#tip_failed").html("Sign up failed, please check your email and password!");
}