diff --git a/web/js/Privacy/request.js b/web/js/Privacy/request.js index c6703dad095ce1ea9929d17fc09e1f99df90ca45..87d7aaf6fb92421a5ec2c9b5f0e3225145df2dbb 100644 --- a/web/js/Privacy/request.js +++ b/web/js/Privacy/request.js @@ -38,24 +38,8 @@ function getReqeustedProjects(){ // ' </div>\n' + // ' </li>'); // } - var idStr = "requestProjectList"; - var htmlStr = "' <li>\\n' +\n" + - " ' <div class=\"req-in\">\\n' +\n" + - " ' <div class=\"proj-des\">\\n' +\n" + - " ' <h3><a href=\"webpage/project-related/project-show.html\">' + data[x].projectname + '</a></h3>\\n' +\n" + - " ' <h5>' + data[x].projectdescription + '</h5>\\n' +\n" + - " ' </div>\\n' +\n" + - " ' <div class=\"req-des\">\\n' +\n" + - " ' <span>Total number of Applicants: ' + data[x].countrequest + '</span>\\n' +\n" + - " ' <div class=\"req-button\">\\n' +\n" + - " ' <a href=\"#project=' + data[x].projectname + '\"><button class=\"candidate\" onclick=\"loadCandidates('+data[x].projectid+')\">See applicants</button></a>\\n' +\n" + - " ' <button class=\"agree\" onclick=\"agreeAll('+projectId+')\">Agree all</button>\\n' +\n" + - " ' </div>\\n' +\n" + - " ' </div>\\n' +\n" + - " ' </div>\\n' +\n" + - " ' </li>'"; - loadSubPage(data); + loadSubPage(data, 1); }, error : function(msg) { alert("get projects failed"); @@ -309,25 +293,26 @@ 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>'); - } + // 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); }, error : function(msg) { alert("get my requests failed"); diff --git a/web/js/ToolBar/pagebar.js b/web/js/ToolBar/pagebar.js index 46c17ad19d4948f329987d3c27bf7052b21f0c18..36a8baaa9311edc920d243b7cb40fc908b77cc35 100644 --- a/web/js/ToolBar/pagebar.js +++ b/web/js/ToolBar/pagebar.js @@ -10,7 +10,7 @@ loadSubPage = function(data, type){ var dataStr = JSON.stringify(data); if(pageNum == 0){ - $("#page-bar").append('<h4>No data here</h4>'); + //$("#page-bar").append('<h4>No data here</h4>'); } else{ $("#page-bar").append('<div id="currentPage" style="display: none"></div>'); //用来存放当前页面编号 $("#page-bar").append("<li id='previousBtn' class='page-item disabled'>\n" + diff --git a/web/webpage/privacy/privacy-my.html b/web/webpage/privacy/privacy-my.html index 8989bb275cd369636333222e17d4dc20a2f2018d..cdfebb2ad8493567f12d22b5ab3b9613607a60d9 100644 --- a/web/webpage/privacy/privacy-my.html +++ b/web/webpage/privacy/privacy-my.html @@ -19,6 +19,7 @@ <!--<script src="../../js/custom.js"></script>--> <!--<script src="../../js/jquery.metisMenu.js"></script>--> + <script src="/js/ToolBar/pagebar.js"></script> <script src="/js/Privacy/request.js"></script> <script> $(function(){ @@ -51,6 +52,19 @@ <!--动态加载请求列表--> </ul> + <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>--> + </ul> + </nav> </div> </div> </div>