Skip to content

H
hunter-ht.cn
Commit e9b67ecd by Fizz
Options

删除小组成员部分

parent 478045c6
Showing with 36 additions and 74 deletions
Hunter_ht/settings.py
...@@ -84,14 +84,14 @@ def get_env_value(env_variable): ...@@ -84,14 +84,14 @@ def get_env_value(env_variable):
sys.exit(-1) sys.exit(-1)
MYSQL_USER = get_env_value('MYSQL_USER') #MYSQL_USER = get_env_value('MYSQL_USER')
MYSQL_PASS = get_env_value('MYSQL_PASS') #MYSQL_PASS = get_env_value('MYSQL_PASS')
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME': 'HUNTER', 'NAME': 'HUNTER',
'USER': MYSQL_USER, 'USER': "root",
'PASSWORD': MYSQL_PASS, 'PASSWORD': "mysql",
'HOST': 'localhost', 'HOST': 'localhost',
'PORT': '3306', 'PORT': '3306',
} }
......
hunter/templates/index.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>野旷天低树江清月近人</title> <title>个人IT学习</title>
{% load static %} {% load static %}
<link rel="icon" href="{% static 'images/logo.ico' %}" type="text/icon"> <link rel="icon" href="{% static 'images/logo.ico' %}" type="text/icon">
<link rel="stylesheet" type="text/css" href="{% static 'style.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'style.css' %}">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<nav> <nav>
<div> <div>
<div id="hunter"> <div id="hunter">
<span>野旷天低树天清月近人</span> <span>个人IT学习</span>
</div> </div>
<div id="bar"> <div id="bar">
<div class="top" id="top_bar"> <div class="top" id="top_bar">
...@@ -111,35 +111,6 @@ ...@@ -111,35 +111,6 @@
</div> </div>
</div> </div>
</section> </section>
<section id="member">
<div class="box"></div>
<div class="left-bar">
<span>
小组成员
</span>
<span class="former">
<button id="show_btn" onclick="show_former()">查看前小组成员</button>
<button style="display: none" id="close_btn" onclick="close_former()">隐藏</button>
</span>
</div>
<div class="wrap" style="padding-top:30px;">
{% for tp,users in user_type_list.items %}
<div class="member_type">
{% if users %}
<p>{{ tp }}</p>
{% for user in users %}
<ul>
<li>
<a href="{% url 'hunter:resume' user.userID %}" target="_blank">{{ user.name_hanzi }}</a>
</li>
<li class="user_mail">{{ user.mailAddress }}</li>
</ul>
{% endfor %}
{% endif %}
</div>
{% endfor %}
</div>
</section>
<section id="project"> <section id="project">
<div class="box"></div> <div class="box"></div>
...@@ -281,7 +252,7 @@ ...@@ -281,7 +252,7 @@
<footer> <footer>
<div class="w-1000 copyright"> <div class="w-1000 copyright">
Copyright © 2013-2020 <strong><a href="//www.hunter-ht.cn/" target="_blank">野旷天低树天清月近人</a></strong>&nbsp; Copyright © 2013-2020 <strong><a href="//www.hunter-ht.cn/" target="_blank">野旷天低树天清月近人</a></strong>&nbsp;
<strong><a href="//www.hunter-ht.cn/" target="_blank">hunter-ht.cn</a></strong> All Rights Reserved. 备案号：<a target="_blank" rel="nofollow" href="http://www.beian.miit.gov.cn">湘ICP备18008562号</a> <strong><a href="//www.hunter-ht.cn/" target="_blank">hunter-ht.cn</a></strong> All Rights Reserved. 备案号：<a target="_blank" rel="nofollow" href="https://beian.miit.gov.cn">湘ICP备18008562号-1</a>
</div> </div>
</footer> </footer>
...@@ -325,15 +296,6 @@ ...@@ -325,15 +296,6 @@
}) })
}); });
function show_former(){
$('#show_btn').css('display','none');
$('#former_member').css('left','0');
}
function close_former(){
$('#show_btn').css('display','block');
$('#former_member').css('left','-100%');
}
function click_bar(index){ function click_bar(index){
......
hunter/views/view_page.py
...@@ -18,35 +18,35 @@ def index_html(request): ...@@ -18,35 +18,35 @@ def index_html(request):
user_id = request.session.get('user_id') user_id = request.session.get('user_id')
print("request index.html, user_id = ", user_id) print("request index.html, user_id = ", user_id)
user_list = User.objects.filter(isCurrent=1).all() user_list = User.objects.filter(isCurrent=1).all()
user_type_list = {"Academic STAFF": [], "Phd": [], "Master": [], "Engineer STAFF": []} #user_type_list = {"Academic STAFF": [], "Phd": [], "Master": [], "Engineer STAFF": []}
# 获取现成员并分类 # 获取现成员并分类
for u in user_list: #for u in user_list:
if u.member_type == 0: # if u.member_type == 0:
u.member_type = "Academic STAFF" # u.member_type = "Academic STAFF"
elif u.member_type == 1: # elif u.member_type == 1:
u.member_type = "Engineer STAFF" # u.member_type = "Engineer STAFF"
elif u.member_type == 2: # elif u.member_type == 2:
u.member_type = "Master" # u.member_type = "Master"
else: # else:
u.member_type = "Phd" # u.member_type = "Phd"
member_type = u.member_type # member_type = u.member_type
user_type_list[member_type].append(u) # user_type_list[member_type].append(u)
# 获取前成员并分类 # 获取前成员并分类
user_list_former = User.objects.filter(isCurrent=0, identity='0').all() #user_list_former = User.objects.filter(isCurrent=0, identity='0').all()
user_type_list_former = {"Academic STAFF": [], "Phd": [], "Master": [], "Engineer STAFF": []} #user_type_list_former = {"Academic STAFF": [], "Phd": [], "Master": [], "Engineer STAFF": []}
for u in user_list_former: #for u in user_list_former:
if u.member_type == 0: # if u.member_type == 0:
u.member_type = "Academic STAFF" # u.member_type = "Academic STAFF"
else: # else:
if u.member_type == 1: # if u.member_type == 1:
u.member_type = "Engineer STAFF" # u.member_type = "Engineer STAFF"
else: # else:
if u.member_type == 2: # if u.member_type == 2:
u.member_type = "Master" # u.member_type = "Master"
else: # else:
u.member_type = "Phd" # u.member_type = "Phd"
member_type = u.member_type # member_type = u.member_type
user_type_list_former[member_type].append(u) # user_type_list_former[member_type].append(u)
# 获取发表文章并排序 # 获取发表文章并排序
publication_list = Publications.objects.filter(isOpen='1').order_by('-date') publication_list = Publications.objects.filter(isOpen='1').order_by('-date')
publication_year_list = {} publication_year_list = {}
...@@ -114,8 +114,8 @@ def index_html(request): ...@@ -114,8 +114,8 @@ def index_html(request):
newest_post_list['article'] = newest_article newest_post_list['article'] = newest_article
newest_post_list['cve'] = newest_cve newest_post_list['cve'] = newest_cve
context = { context = {
'user_type_list': user_type_list, # 'user_type_list': user_type_list,
'user_type_list_former': user_type_list_former, # 'user_type_list_former': user_type_list_former,
'publication_year_list': publication_year_list, 'publication_year_list': publication_year_list,
'cve_list': bug_list, 'cve_list': bug_list,
'article_year_list': article_year_list, 'article_year_list': article_year_list,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment