update user detail
This commit is contained in:
wcharles
parent
f8c9446b34
commit
9c48a9c718
|
|
@ -13,14 +13,16 @@ class UserForm(forms.Form):
|
||||||
('1', "未删除"),
|
('1', "未删除"),
|
||||||
('0', "删除"),
|
('0', "删除"),
|
||||||
)
|
)
|
||||||
username = forms.CharField(label="账号",max_length=30, widget=forms.TextInput())
|
|
||||||
name = forms.CharField(label="姓名", max_length=20, widget=forms.TextInput())
|
userid = forms.CharField(widget=forms.HiddenInput())
|
||||||
empid = forms.CharField(label="工号", max_length=20, widget=forms.TextInput())
|
username = forms.CharField(label="账号",max_length=30, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
password = forms.CharField(label="密码", max_length=256, widget=forms.PasswordInput())
|
name = forms.CharField(label="姓名", max_length=20, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
ubelongpart = forms.ModelChoiceField(queryset=s_models.Partment.objects.all())
|
empid = forms.CharField(label="工号", max_length=20, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
openid = forms.CharField(label="公众号openid", max_length=200, widget=forms.TextInput())
|
#password = forms.CharField(label="密码", max_length=256, widget=forms.PasswordInput())
|
||||||
nickname = forms.CharField(label="昵称", max_length=200, widget=forms.TextInput())
|
ubelongpart = forms.ModelChoiceField(label="ubelongpart", queryset=s_models.Partment.objects.all(), widget=forms.Select(attrs={'class': 'form-control'}))
|
||||||
mpopenid = forms.CharField(label="小程序openid", max_length=200, widget=forms.TextInput())
|
openid = forms.CharField(label="公众号openid", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
deletemark = forms.ChoiceField(label='删除标记', choices=mark)
|
nickname = forms.CharField(label="昵称", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
headimgurl = forms.CharField(label="头像", max_length=200, required=False, widget=forms.TextInput())
|
mpopenid = forms.CharField(label="小程序openid", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
usecomp = forms.ModelChoiceField(queryset=s_models.Partment.objects.all())#所属公司
|
deletemark = forms.ChoiceField(label='删除标记', choices=mark, widget=forms.Select(attrs={'class': 'form-control'}))
|
||||||
|
#headimgurl = forms.CharField(label="头像", max_length=200, required=False, widget=forms.TextInput(attrs={'class': 'form-control'}))
|
||||||
|
usecomp = forms.ModelChoiceField(label="所属公司", queryset=s_models.Partment.objects.all(), widget=forms.Select(attrs={'class': 'form-control'}))
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@
|
||||||
{% block pagehead %}
|
{% block pagehead %}
|
||||||
<section class="content-header">
|
<section class="content-header">
|
||||||
<h1>
|
<h1>
|
||||||
公司列表
|
公司员工列表
|
||||||
<small>companys list</small>
|
<small></small>
|
||||||
</h1>
|
</h1>
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li><a href="{% url 'groups_index' %}"><i class="fa fa-dashboard"></i> 主页</a></li>
|
<li><a href="{% url 'groups_index' %}"><i class="fa fa-dashboard"></i> 主页</a></li>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,146 @@
|
||||||
<!DOCTYPE html>
|
{% extends "./base.html" %}
|
||||||
<html lang="en">
|
{% load static %}
|
||||||
<head>
|
{% block headother%}
|
||||||
<meta charset="UTF-8">
|
<!-- DataTables -->
|
||||||
<title>Title</title>
|
<link rel="stylesheet" href="{% static 'groups/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css' %}">
|
||||||
</head>
|
|
||||||
<body>
|
{% endblock %}
|
||||||
<h1>uid={{ uid }}</h1>
|
|
||||||
</body>
|
|
||||||
</html>
|
{% block title %}员工信息{% endblock %}
|
||||||
|
|
||||||
|
{% block pagehead %}
|
||||||
|
<section class="content-header">
|
||||||
|
<h1>
|
||||||
|
员工信息
|
||||||
|
<small></small>
|
||||||
|
</h1>
|
||||||
|
<ol class="breadcrumb">
|
||||||
|
<li><a href="{% url 'groups_index' %}"><i class="fa fa-dashboard"></i> 主页</a></li>
|
||||||
|
<li class="active">员工信息</li>
|
||||||
|
</ol>
|
||||||
|
</section>
|
||||||
|
{% endblock %}
|
||||||
|
{% block content %}
|
||||||
|
<!-- Main content -->
|
||||||
|
<section class="content">
|
||||||
|
<div class="row">
|
||||||
|
<!-- right column -->
|
||||||
|
<div class="col-md-12">
|
||||||
|
<!-- Horizontal Form -->
|
||||||
|
<div class="box box-info">
|
||||||
|
<div class="box-header with-border">
|
||||||
|
<h3 class="box-title">员工信息</h3>
|
||||||
|
</div>
|
||||||
|
<!-- /.box-header -->
|
||||||
|
<!-- form start -->
|
||||||
|
<form class="form-horizontal" method="post" action="{% url 'groups_userupdate' %}">
|
||||||
|
{% csrf_token %}{{ user_form.userid }}
|
||||||
|
{% if message %}
|
||||||
|
<p style="color:red">{{ message }}</p>
|
||||||
|
{% endif %}
|
||||||
|
<div class="box-body">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.username.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.username}} {{ user_form.username.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.name.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.name}}{{ user_form.name.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.empid.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.empid}}{{ user_form.empid.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.ubelongpart.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.ubelongpart}}{{ user_form.ubelongpart.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.openid.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.openid}}{{ user_form.openid.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.nickname.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.nickname}}{{ user_form.nickname.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.headimgurl.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.headimgurl}}{{ user_form.headimgurl.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.deletemark.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.deletemark}}{{ user_form.deletemark.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.mpopenid.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.mpopenid}}{{ user_form.mpopenid.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-sm-2 control-label">{{ user_form.usecomp.label_tag }}</label>
|
||||||
|
<div class="col-sm-6">
|
||||||
|
{{ user_form.usecomp}}{{ user_form.usecomp.errors }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- /.box-body -->
|
||||||
|
<div class="box-footer">
|
||||||
|
<button type="submit" class="btn btn-primary">提交</button>
|
||||||
|
</div>
|
||||||
|
<!-- /.box-footer -->
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<!-- /.box -->
|
||||||
|
</div>
|
||||||
|
<!--/.col (right) -->
|
||||||
|
</div>
|
||||||
|
<!-- /.row -->
|
||||||
|
</section>
|
||||||
|
<!-- /.content -->
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block endother%}
|
||||||
|
<!-- DataTables -->
|
||||||
|
<script src="{% static 'groups/bower_components/datatables.net/js/jquery.dataTables.min.js' %}"></script>
|
||||||
|
<script src="{% static 'groups/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
|
||||||
|
<!-- SlimScroll -->
|
||||||
|
<script src="{% static 'groups/bower_components/jquery-slimscroll/jquery.slimscroll.min.js' %}"></script>
|
||||||
|
<!-- FastClick -->
|
||||||
|
<script src="{% static 'groups/bower_components/fastclick/lib/fastclick.js' %}"></script>
|
||||||
|
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(function () {
|
||||||
|
$('#example1').DataTable()
|
||||||
|
$('#example2').DataTable({
|
||||||
|
'paging' : true,
|
||||||
|
'lengthChange': false,
|
||||||
|
'searching' : false,
|
||||||
|
'ordering' : true,
|
||||||
|
'info' : true,
|
||||||
|
'autoWidth' : false
|
||||||
|
})
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ urlpatterns = [
|
||||||
path('company/', views.company, name='groups_company'),
|
path('company/', views.company, name='groups_company'),
|
||||||
path('company/user/<int:cid>/', views.company_user, name='groups_cuser'),
|
path('company/user/<int:cid>/', views.company_user, name='groups_cuser'),
|
||||||
path('company/userdetail/<int:uid>/', views.company_userdetail, name='groups_userdetail'),
|
path('company/userdetail/<int:uid>/', views.company_userdetail, name='groups_userdetail'),
|
||||||
|
path('company/userupdate/', views.groups_userupdate, name='groups_userupdate'),
|
||||||
|
|
||||||
path('trouble/', views.trouble, name='groups_trouble'),#隐患排查统计图
|
path('trouble/', views.trouble, name='groups_trouble'),#隐患排查统计图
|
||||||
path('observe/', views.observe, name='groups_observe'),#行为观察统计图
|
path('observe/', views.observe, name='groups_observe'),#行为观察统计图
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,11 @@ from django.http import HttpResponse,JsonResponse
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from django.shortcuts import redirect
|
from django.shortcuts import redirect
|
||||||
from .models import Group,GroupUser
|
from .models import Group,GroupUser
|
||||||
from .forms import GroupUserForm
|
from .forms import GroupUserForm, UserForm
|
||||||
from safesite import models as s_models
|
from safesite import models as s_models
|
||||||
from safesite.tasks import gettime
|
from safesite.tasks import gettime
|
||||||
|
from django.forms.models import model_to_dict
|
||||||
|
from django.http import Http404
|
||||||
import requests
|
import requests
|
||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
|
|
@ -81,8 +83,37 @@ def company_user(request, cid):
|
||||||
return render(request, 'groups/company_user.html', locals())
|
return render(request, 'groups/company_user.html', locals())
|
||||||
|
|
||||||
def company_userdetail(request, uid):
|
def company_userdetail(request, uid):
|
||||||
|
try:
|
||||||
|
user = s_models.User.objects.get(pk=uid)
|
||||||
|
except s_models.User.DoesNotExist:
|
||||||
|
raise Http404("User does not exist")
|
||||||
|
user_form = UserForm(model_to_dict(user))
|
||||||
|
# print(type(user))
|
||||||
|
# print(user_form)
|
||||||
|
# dump(user)
|
||||||
return render(request, 'groups/company_userdetail.html', locals())
|
return render(request, 'groups/company_userdetail.html', locals())
|
||||||
|
|
||||||
|
def groups_userupdate(request):
|
||||||
|
if request.method == 'POST':
|
||||||
|
user_form = UserForm(request.POST)
|
||||||
|
if user_form.is_valid():
|
||||||
|
model_user = s_models.User()
|
||||||
|
model_user.userid = user_form.cleaned_data.get('userid')
|
||||||
|
model_user.username = user_form.cleaned_data.get('username')
|
||||||
|
model_user.name = user_form.cleaned_data.get('name')
|
||||||
|
model_user.empid = user_form.cleaned_data.get('empid')
|
||||||
|
model_user.ubelongpart = user_form.cleaned_data.get('ubelongpart')
|
||||||
|
model_user.openid = user_form.cleaned_data.get('openid')
|
||||||
|
model_user.nickname = user_form.cleaned_data.get('nickname')
|
||||||
|
model_user.headimgurl = user_form.cleaned_data.get('headimgurl')
|
||||||
|
model_user.deletemark = user_form.cleaned_data.get('deletemark')
|
||||||
|
model_user.mpopenid = user_form.cleaned_data.get('mpopenid')
|
||||||
|
model_user.usecomp = user_form.cleaned_data.get('usecomp')
|
||||||
|
model_user.save()
|
||||||
|
return render(request, 'groups/company_userdetail.html', locals())
|
||||||
|
else:
|
||||||
|
return redirect('/groups/company/')
|
||||||
|
|
||||||
def dump(obj):
|
def dump(obj):
|
||||||
print('\n'.join(['%s:%s' % item for item in obj.__dict__.items()]))
|
print('\n'.join(['%s:%s' % item for item in obj.__dict__.items()]))
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue