Skip to content

Commit

Permalink
Add Sector's KPI page
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonkla
tonkla committed Sep 16, 2010
1 parent e95ec70 commit 36ade85
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 72 deletions.
0 domain/management.py → domain/_management.py
View file
File renamed without changes.
12 changes: 9 additions & 3 deletions helper/templatetags/page_tags.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,16 @@ def display_report_sending_notice(submission):
@register.simple_tag
def print_program_kpis(program):
ret = ''
kpis = DomainKPI.objects.filter(program=program)
kpis = DomainKPI.objects.filter(program=program)
for kpi in kpis:
ret += kpi.abbr_name + ' '
return ret.strip()
kpi_schedules = DomainKPISchedule.objects.filter(kpi=kpi)
for kpi_schedule in kpi_schedules:
ret += '<a href="' + \
reverse('view_kpi_overview', args=[kpi_schedule.id]) +'">'+ \
kpi.abbr_name + '</a>, '
if ret != '':
ret = '(%s)' % (ret[:-2])
return ret

@register.simple_tag
def print_master_plan_quarter_kpi(kpi_type, plan, quarter_year, quarter_no):
Expand Down
13 changes: 8 additions & 5 deletions kpi/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from forms import *
from models import *

from domain.models import Sector, MasterPlan, Program
from domain.models import MasterPlan, Program, Sector, SectorMasterPlan
from kpi.models import DomainKPI, DomainKPISchedule

from helper import utilities, permission
Expand All @@ -21,9 +21,12 @@
@login_required
def view_sector_kpi(request, sector_ref_no):
sector = get_object_or_404(Sector, ref_no=sector_ref_no)
#quarter_year = master_plan_current_year_number(sector)
quarter_year = 2010
ctx = {'sector': sector, 'quarter_year': quarter_year}
sector_master_plans = SectorMasterPlan.objects.filter(sector=sector)
master_plans = []
for sm in sector_master_plans:
master_plans.append(sm.master_plan)
quarter_year = utilities.master_plan_current_year_number()
ctx = {'sector': sector, 'master_plans': master_plans, 'quarter_year': quarter_year}
return render_page_response(request, 'kpi', 'page_sector/sector_kpi.html', ctx)

#
Expand All @@ -33,7 +36,7 @@ def view_sector_kpi(request, sector_ref_no):
@login_required
def view_master_plan_kpi(request, master_plan_ref_no):
master_plan = get_object_or_404(MasterPlan, ref_no=master_plan_ref_no)
quarter_year = utilities.master_plan_current_year_number(master_plan)
quarter_year = utilities.master_plan_current_year_number()
ctx = {'master_plan': master_plan, 'quarter_year': quarter_year}
return render_page_response(request, 'kpi', 'page_sector/master_plan_kpi.html', ctx)

Expand Down
Binary file added legacy/sms_dev_20100915.sql.gz
View file
Binary file not shown.
13 changes: 12 additions & 1 deletion media/css/styles.page.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
h2.h2 {font-size:138.5%;padding-bottom:5px;margin-bottom:10px;color:#2D8659;border-bottom:3px solid #999;}


th {font-size:123.1%;text-align:center;}
.bold {font-weight:bold;}
.center {text-align:center;}

.ss_report_schedule li {border:1px solid #999;margin-bottom:15px;padding:10px;}
.ss_report_schedule h4 {font-size:116%;color:#2D8659;border-bottom:1px dashed #999;padding-bottom:5px;}
Expand Down Expand Up @@ -94,12 +96,21 @@ h2.h2 {font-size:138.5%;padding-bottom:5px;margin-bottom:10px;color:#2D8659;bord
.sector_overview_page .master_plans li {margin-bottom:8px;font-size:108%;}
.sector_overview_page .master_plans {}

.sector_overview_page .kpi td {padding:10px 5px;}
.sector_overview_page .kpi li.master_plan {font-size:138.5%;font-weight:bold;padding:5px 0;}
.sector_overview_page .kpi li.plan {font-size:123.1%;padding:3px 10px;}
.sector_overview_page .kpi li.program {list-style-type:disc;margin-left:30px;padding:3px;}

/*
* MASTER PLAN
*/

/* Master Plan - Overview Page */

.master_plan_overview_page .kpi td {padding:10px 5px;}
.master_plan_overview_page .kpi li.plan {font-size:123.1%;padding:3px;}
.master_plan_overview_page .kpi li.program {list-style-type:disc;margin-left:30px;padding:3px;}

/* Master Plan - Programs Page */
.master_plan_programs_page {}
.master_plan_programs_page h2 {font-size:138.5%;color:#333;border-bottom:1px solid #999;margin:5px 0px 10px;padding-bottom:5px;}
Expand Down
56 changes: 29 additions & 27 deletions templates/page_sector/master_plan_kpi.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,37 @@

{% block body_content %}
<div class="master_plan_overview_page">
<table border="1" width="100%">
<th rowspan="2">กิจกรรมที่แผนงานต้องดำเนินการ</th>
{% generate_quarter_table_header quarter_year %}
<tr>
{% for i in 4|get_range %}
<td>คาดการณ์</td>
<td>ผลที่เกิด</td>
{% endfor %}
</tr>
{% for plan in master_plan.plan_set.all %}
<div class="kpi">
<table border="1" width="100%">
<th rowspan="2" class="center">กิจกรรมที่แผนงานต้องดำเนินการ</th>
{% generate_quarter_table_header quarter_year %}
<tr>
<td>
<ul>
<li>{{ plan.name }} ({{ plan.ref_no }})</li>
{% for program in plan.program_set.all %}
<li><a href="{% url view_program_overview program.id %}">{{ program.name }}</a> [{% print_program_kpis program %}]</li>
{% endfor %}
</ul>
</td>
{% for quarter_no in 4|get_range %}
<td>
{% print_master_plan_quarter_kpi 'target' plan quarter_year quarter_no %}
</td>
<td>
{% print_master_plan_quarter_kpi 'result' plan quarter_year quarter_no %}
</td>
{% for i in 4|get_range %}
<td>คาดการณ์</td>
<td>ผลที่เกิด</td>
{% endfor %}
</tr>
{% endfor %}
</table>
{% for plan in master_plan.plan_set.all %}
<tr>
<td>
<ul>
<li class="plan">{{ plan.name }} ({{ plan.ref_no }})</li>
{% for program in plan.program_set.all %}
<li class="program"><a href="{% url view_program_overview program.id %}">{{ program.name }}</a> {% print_program_kpis program %}</li>
{% endfor %}
</ul>
</td>
{% for quarter_no in 4|get_range %}
<td>
{% print_master_plan_quarter_kpi 'target' plan quarter_year quarter_no %}
</td>
<td>
{% print_master_plan_quarter_kpi 'result' plan quarter_year quarter_no %}
</td>
{% endfor %}
</tr>
{% endfor %}
</table>
</div>
</div>
{% endblock %}
69 changes: 33 additions & 36 deletions templates/page_sector/sector_kpi.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,42 @@

{% block body_content %}
<div class="sector_overview_page">
<!-- Master Plan -->
<div class="master_plans">
<ul>
{% for master_plan in sector.master_plans %}
<li>แผน {{master_plan.ref_no}} {{master_plan.name}}</li>
{% endfor %}
</ul>
</div>

<table border="1" width="100%">
<th rowspan="2">กิจกรรมที่สำนักต้องดำเนินการ</th>
{% generate_quarter_table_header quarter_year %}
<tr>
{% for i in 4|get_range %}
<td>คาดการณ์</td>
<td>ผลที่เกิด</td>
{% endfor %}
</tr>
{% for plan in master_plan.plan_set.all %}
<div class="kpi">
<table border="1" width="100%">
<th rowspan="2">กิจกรรมที่สำนักต้องดำเนินการ</th>
{% generate_quarter_table_header quarter_year %}
<tr>
<td>
<ul>
<li>{{ plan.name }} ({{ plan.ref_no }})</li>
{% for program in plan.program_set.all %}
<li><a href="{% url view_program_overview program.id %}">{{ program.name }}</a> [{% print_program_kpis program %}]</li>
{% endfor %}
</ul>
</td>
{% for quarter_no in 4|get_range %}
<td>
{% print_master_plan_quarter_kpi 'target' plan quarter_year quarter_no %}
</td>
{% for i in 4|get_range %}
<td>คาดการณ์</td>
<td>ผลที่เกิด</td>
{% endfor %}
</tr>
{% for master_plan in master_plans %}
{% for plan in master_plan.plan_set.all %}
<tr>
<td>
{% print_master_plan_quarter_kpi 'result' plan quarter_year quarter_no %}
<ul>
{% if forloop.first %}
<li class="master_plan">แผน {{ master_plan.ref_no }} {{ master_plan.name }}</li>
{% endif %}
<li class="plan">{{ plan.name }} ({{ plan.ref_no }})</li>
{% for program in plan.program_set.all %}
<li class="program"><a href="{% url view_program_overview program.id %}">{{ program.name }}</a> {% print_program_kpis program %}</li>
{% endfor %}
</ul>
</td>
{% for quarter_no in 4|get_range %}
<td>
{% print_master_plan_quarter_kpi 'target' plan quarter_year quarter_no %}
</td>
<td>
{% print_master_plan_quarter_kpi 'result' plan quarter_year quarter_no %}
</td>
{% endfor %}
</tr>
{% endfor %}
</tr>
{% endfor %}
</table>

{% endfor %}
</table>
</div>
</div>
{% endblock %}

0 comments on commit 36ade85

Please sign in to comment.