Browse Source

Signed-off-by: zry <admin@z-touhou.org>

zry 8 years ago
parent
commit
48c268b516
5 changed files with 8 additions and 7 deletions
  1. 5 5
      UserManage/forms.py
  2. BIN
      static/SCL90.xlsx
  3. BIN
      static/class.xls
  4. BIN
      static/user.xls
  5. 3 2
      templates/UserManage/user.addxls.html

+ 5 - 5
UserManage/forms.py

@@ -80,7 +80,7 @@ class AddUserForm(forms.ModelForm):
             'classid' : forms.Select(choices=[(x.name,x.name) for x in GroupList.objects.all()],attrs={'class':'form-control'}),
             'email' : forms.TextInput(attrs={'class':'form-control'}),
             'nickname' : forms.TextInput(attrs={'class':'form-control'}),
-            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女')),attrs={'class':'list-inline'}),
+            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女'),(u'保密', u'保密')),attrs={'class':'list-inline'}),
             'birthday' : forms.TextInput(attrs={'class':'form-control'}),
             'role' : forms.Select(attrs={'class':'form-control'}),
             'is_active' : forms.Select(choices=((True, u'启用'),(False, u'禁用')),attrs={'class':'form-control'}),
@@ -132,7 +132,7 @@ class EditUserForm(forms.ModelForm):
             'classid' : forms.Select(choices=[(x.name,x.name) for x in GroupList.objects.all()],attrs={'class':'form-control'}),
             'email' : forms.TextInput(attrs={'class':'form-control'}),
             'nickname' : forms.TextInput(attrs={'class':'form-control'}),
-            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女')),attrs={'class':'list-inline'}),
+            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女'),(u'保密', u'保密')),attrs={'class':'list-inline'}),
             'birthday' : forms.TextInput(attrs={'class':'form-control'}),
             'role' : forms.Select(choices=[(x.name,x.name) for x in RoleList.objects.all()],attrs={'class':'form-control'}),
             'is_active' : forms.Select(choices=((True, u'启用'),(False, u'禁用')),attrs={'class':'form-control'}),
@@ -253,7 +253,7 @@ class ChangeUserForm(forms.ModelForm):
             #'password': forms.HiddenInput,
             'email' : forms.TextInput(attrs={'class':'form-control'}),
             'nickname' : forms.TextInput(attrs={'class':'form-control'}),
-            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女')),attrs={'class':'list-inline'}),
+            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女'),(u'保密', u'保密')),attrs={'class':'list-inline'}),
             'birthday' : forms.TextInput(attrs={'class':'form-control'}),
         }
 
@@ -279,7 +279,7 @@ class AddAdminForm(forms.ModelForm):
             'sid' : forms.TextInput(attrs={'class':'form-control'}),
             'email' : forms.TextInput(attrs={'class':'form-control'}),
             'nickname' : forms.TextInput(attrs={'class':'form-control'}),
-            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女')),attrs={'class':'list-inline'}),
+            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女'),(u'保密', u'保密')),attrs={'class':'list-inline'}),
         }
 
     def __init__(self,*args,**kwargs):
@@ -317,7 +317,7 @@ class SignInUserForm(forms.ModelForm):
             'classid' : forms.Select(choices=[(x.name,x.name) for x in GroupList.objects.all()],attrs={'class':'form-control'}),
             'email' : forms.TextInput(attrs={'class':'form-control'}),
             'nickname' : forms.TextInput(attrs={'class':'form-control'}),
-            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女')),attrs={'class':'list-inline'}),
+            'sex' : forms.RadioSelect(choices=((u'男', u'男'),(u'女', u'女'),(u'保密', u'保密')),attrs={'class':'list-inline'}),
             'birthday' : forms.TextInput(attrs={'class':'form-control'}),
         }
 

BIN
static/SCL90.xlsx


BIN
static/class.xls


BIN
static/user.xls


+ 3 - 2
templates/UserManage/user.addxls.html

@@ -20,8 +20,9 @@
 
 
 	<h4 class="col-md-offset-1">请导入符合格式的XLS文件</h4>
-	<h4 class="col-md-offset-1">批量导入用户仅限于普通用户,不能批量导入管理员账户</h4>
-	<h4 class="col-md-offset-1">XLS格式模板<a href='/static/user.xls'>下载</a></h4>
+	<h4 class="col-md-offset-1">批量导入的用户的角色为普通学生,需要其他角色请手工在“用户管理”中修改。</h4>
+	<h4 class="col-md-offset-1">XLS格式模板<a href='/static/user.xls'>下载</a>。</h4>
+    <h4 class="col-md-offset-1">分组号可去“分组管理”处查看,亦可<a href='/static/class.xls'>下载</a>本表查看默认分组编号。</h4>
 	<hr/>
     <form class="form-horizontal" role="form" action={% url "addxlsuserurl" %} method="POST" enctype="multipart/form-data">
     {% csrf_token %}