raiot
/
TasksManager
mirror of https://github.com/raiots/TasksManager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix some bugs; evaluate_factor editable in details

This commit is contained in:
raiots 2021-04-10 16:26:44 +08:00
parent a6022a3865
commit 80f3f7f9d8
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
static/* linguist-vendored

4
apps/tasks/forms.py
View File

@ -1,6 +1,7 @@
from django import forms from django import forms
from .models import Todo from .models import Todo
class LoginForm(forms.Form): class LoginForm(forms.Form):
username = forms.CharField(error_messages={'required': '用户名不能为空'}) username = forms.CharField(error_messages={'required': '用户名不能为空'})
password = forms.CharField() password = forms.CharField()
@ -12,9 +13,8 @@ class TodoForm(forms.ModelForm):
class Meta: class Meta:
model = Todo model = Todo
fields = ['maturity', 'real_work', 'complete_note'] fields = ['maturity', 'real_work', 'evaluate_factor', 'complete_note']
labels ={'text': ''} labels ={'text': ''}
widgets = {'rows': '3'} widgets = {'rows': '3'}
# TODO 数据不可为空 # TODO 数据不可为空

4
templates/tasks/base.html
View File

@ -53,10 +53,10 @@ scratch. This page gets rid of all links and provides the needed markup only.
<a href="{% url 'tasks:tasklist' %}" class="nav-link">年度任务</a> <a href="{% url 'tasks:tasklist' %}" class="nav-link">年度任务</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="/admin" class="nav-link">编辑任务</a> <a href="/admin/#tasks/task" class="nav-link">编辑任务</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="/admin" class="nav-link">系统配置</a> <a href="/admin/#users/user" class="nav-link">系统配置</a>
</li> </li>
{# <li class="nav-item dropdown">#} {# <li class="nav-item dropdown">#}
{# <a id="dropdownSubMenu1" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle">统计与分析</a>#} {# <a id="dropdownSubMenu1" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle">统计与分析</a>#}

6
templates/tasks/todo.html
View File

@ -9,7 +9,7 @@
<div class="container"> <div class="container">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-6"> <div class="col-sm-6">
<h1 class="m-0"> 我的任务 <small>Example 3.0</small></h1> <h1 class="m-0"> 我的任务 <small></small></h1>
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-sm-6"> <div class="col-sm-6">
<ol class="breadcrumb float-sm-right"> <ol class="breadcrumb float-sm-right">
@ -74,6 +74,10 @@
<label for="exampleInputEmail1">实际工作量</label> <label for="exampleInputEmail1">实际工作量</label>
{{ form.real_work }} {{ form.real_work }}
</div> </div>
<div>
<label for="exampleInputEmail">折算系数</label>
{{ form.evaluate_factor }}
</div>
<div class="form-group"> <div class="form-group">
<label for="exampleInputPassword1">完成情况说明</label> <label for="exampleInputPassword1">完成情况说明</label>
{{ form.complete_note }} {{ form.complete_note }}