@@ -71,16 +71,17 @@ div#searchform input#q { width: 300px; margin: 0; }
div#searchform input#submit { margin-left: 5px; }
div#list ul { display: block; list-style-type: none; padding: 0; border: 1px solid #AAA; margin-top: 3px; }
-div#list table#list { margin: 0px; padding: 0px; border-spacing: 0px; border: 1px solid #AAA; font-size: .85em; width: 100%; }
-div#list tr.datarow a, div#list tr#headerrow td { padding-top: 5px; padding-bottom: 5px; }
-div#list tr#headerrow { background-color: #DDD; }
-div#list tr#headerrow td { border-bottom: 1px solid #AAA; text-align: left; font-weight: bold; }
-div#list tr.datarow a { display: block; }
-div#list table#list td:first-child { padding-left: 8px; font-weight: bold; }
-div#list table#list td:last-child { padding-right: 8px; text-align: right; }
-div#list table#list tr.datarow td:last-child { font-size: .8em; }
-div#list tr.datarow:hover { background-color: #4A0010; }
-div#list tr.datarow:hover a { color: #CCC; text-decoration: none; }
+
+table#list { margin: 0px; padding: 0px; border-spacing: 0px; border: 1px solid #AAA; font-size: .85em; width: 100%; }
+table#list tr.datarow a, table#list tr#headerrow td { padding-top: 5px; padding-bottom: 5px; }
+table#list tr#headerrow { background-color: #DDD; }
+table#list tr#headerrow td { border-bottom: 1px solid #AAA; text-align: left; font-weight: bold; }
+table#list tr.datarow a { display: block; }
+table#list td:first-child { padding-left: 8px; font-weight: bold; }
+table#list td:last-child { padding-right: 8px; text-align: right; }
+table#list tr.datarow td:last-child { font-size: .8em; }
+table#list tr.datarow:hover { background-color: #4A0010; }
+table#list tr.datarow:hover a { color: #CCC; text-decoration: none; }
div#barcode { background: url(../images/barcode-250.png) no-repeat; width: 250px; height: 23px; padding-top: 60px; text-align: center; font-weight: bold; letter-spacing: 4px; font-size: 13px; }
div#detail div#barcode { float: left; position: relative; right: 5px; }
@@ -93,6 +94,8 @@ div#detail h3 { margin: 10px 0; border-bottom: 1px solid #888; color: #444; font
div#detail div.right { width: 450px; margin-left: 20px; }
div#detail div.right h3 { margin-top: 0px; }
div#detail table { font-weight: bold; font-size: 1.1em; }
+div#detail table#list { font-weight: inherit; font-size: .85em; }
+div#detail table#list td:last-child { text-align: inherit; }
div#detail table#toprow { width: 100%; }
div#detail table#toprow input { width: auto; }
div#detail td#barcode { text-align: right; }
_media/css/screen.css
@@ -13,7 +13,11 @@ class Checkout(models.Model):
first_name = models.CharField(max_length=100)
last_name = models.CharField(max_length=100)
department_text = models.CharField(max_length=100)
- department = models.ForeignKey(structure.OrganizationalUnit, null=True)
+ department = models.ForeignKey(
+ structure.OrganizationalUnit,
+ null=True,
+ blank=True
+ )
course = models.CharField(max_length=20, blank=True)
phone = lfus.PhoneNumberField()
email = models.EmailField(max_length=75)
@@ -28,7 +32,10 @@ class Checkout(models.Model):
max_length=8,
choices=constants.CHECKOUT_TYPES
)
- return_type = models.CharField(max_length=9, choices=constants.RETURN_TYPES)
+ return_type = models.CharField(
+ max_length=9,
+ choices=constants.RETURN_TYPES
+ )
creation_date = models.DateTimeField(default=dt.datetime.now)
out_date = models.DateTimeField()
return_date = models.DateTimeField()
checkout/models.py
@@ -1,49 +1,225 @@
{% extends "root.html" %}
{% load etcetera_tags %}
-{% block title %}{{ object.first_name }} {{ object.last_name }} (Checkout #{{ object.id }}){% endblock %}
+{% block title %}
+ {{ object.first_name }} {{ object.last_name }} (Checkout #{{ object.id }})
+{% endblock %}
-{% block breadcrumb %}<a href="{% url etcetera-home %}">Home</a> › <a href="{% if object.completed %}#{% else %}{% url checkout-index %}{% endif %}">Checkout List{% if object.completed %} Archive{% endif %}</a> › Checkout #{{ object.id }}{% endblock %}
+{% block breadcrumb %}
+ <a href="{% url etcetera-home %}">Home</a> ›
+ <a href="{% if object.completed %}#{% else %}{% url checkout-index %}{% endif %}">
+ Checkout List
+ {% if object.completed %} Archive{% endif %}
+ </a> ›
+ Checkout #{{ object.id }}
+{% endblock %}
{% block content %}
<div id="detail">
{% if user.is_authenticated and not object.completed %}
- {% if not object.equipment_list %}<div id="alert" class="banner">This checkout doesn't have any equipment associated with it. To edit it, click <a href="#">click here</a>.</div>{% endif %}
- {% ifequal object.delivering_user user %}<div id="notify" class="banner">You've been assigned to deliver this ticket.</div>{% endifequal %}
+ {% if not object.equipment_list %}
+ <div id="alert" class="banner">
+ This checkout doesn't have any equipment associated with it.
+ To edit it, click <a href="#">click here</a>.
+ </div>
+ {% endif %}
+ {% ifequal object.delivering_user user %}
+ <div id="notify" class="banner">
+ You've been assigned to deliver this ticket.
+ </div>
+ {% endifequal %}
{% endif %}
- <h1>{% if user.is_authenticated %}<span class="right"><a href="#">edit</a></span>{% endif %}{{ object.first_name }} {{ object.last_name }} (Checkout #{{ object.id }}){% if object.completed %} <span class="head">completed</span>{% endif %}</h1>
- <h2>{% if object.creation_date %}<span class="right"><span class="head">Created</span> {{ object.creation_date|date:'n/j/Y g:iA' }}</span>{% endif %}Deliver at {{ object.out_date|date:'n/j/Y g:iA' }} › Return at {{ object.return_date|date:'n/j/Y g:iA' }}</h2>
+
+ <h1>
+ {% if user.is_authenticated %}
+ <span class="right"><a href="#">edit</a></span>
+ {% endif %}
+ {{ object.first_name }} {{ object.last_name }}
+ (Checkout #{{ object.id }})
+ <span class="head">{{ object.get_checkout_type_display }}</span>
+ {% if object.completed %}
+ <span class="head">/ completed</span>
+ {% endif %}
+ </h1>
+
+ <h2>
+ {% if object.creation_date %}
+ <span class="right">
+ <span class="head">Created</span>
+ {{ object.creation_date|date:'n/j/Y g:iA' }}
+ </span>
+ {% endif %}
+ {% ifequal object.checkout_type 'delivery' %}
+ ETC will deliver
+ {% else %}
+ Patron will pick up
+ {% endifequal %}
+ at {{ object.out_date|date:'n/j/Y g:iA' }}<br />
+ {% ifequal object.return_type 'etc' %}
+ ETC
+ {% else %}
+ Patron
+ {% endifequal %}
+ will return at {{ object.return_date|date:'n/j/Y g:iA' }}
+ </h2>
+
<div class="right">
<h3>Contact information</h3>
<table>
- {% if object.phone %}<tr><td class="tablehead">Phone</td><td>{{ object.phone }}</td></tr>{% endif %}
- {% if object.email %}<tr><td class="tablehead">Email</td><td><a href="mailto:{{ object.email }}">{{ object.email }}</a></td></tr>{% endif %}
+ {% if object.phone %}
+ <tr>
+ <td class="tablehead">Phone</td>
+ <td>{{ object.phone }}</td>
+ </tr>
+ {% endif %}
+ {% if object.email %}
+ <tr>
+ <td class="tablehead">Email</td>
+ <td>
+ <a href="mailto:{{ object.email }}">{{ object.email }}</a>
+ </td>
+ </tr>
+ {% endif %}
</table>
</div>
+
<h3>Brief information</h3>
<table>
- <tr><td class="tablehead">Submitted by</td><td>{{ object.first_name }} {{ object.last_name }}</td></tr>
- {% if object.department or object.department_text %}<tr><td class="tablehead">Department</td><td>{% if object.department %}{{ object.department }}{% else %}{{ object.department_text }} (user-submitted){% endif %}</td></tr>{% endif %}
- {% if object.building %}<tr><td class="tablehead">{% ifequal object.checkout_type "delivery" %}Delivery {% endifequal %}Location</td><td>{{ object.building.name }} {{ object.room }}</td></tr>{% endif %}
- {% if object.location_text %}<tr><td class="tablehead">Other location</td><td>{{ object.location_text }}</td></tr>{% endif %}
+ <tr>
+ <td class="tablehead">Submitted by</td>
+ <td>{{ object.first_name }} {{ object.last_name }}</td>
+ </tr>
+ {% if object.department or object.department_text %}
+ <tr>
+ <td class="tablehead">Department</td>
+ <td>
+ {% if object.department %}
+ {{ object.department }}
+ {% else %}
+ {{ object.department_text }} (user-submitted)
+ {% endif %}
+ </td>
+ </tr>
+ {% endif %}
+ {% if object.course %}
+ <tr>
+ <td class="tablehead">Course</td>
+ <td>{{ object.course }}</td>
+ </tr>
+ {% endif %}
+ {% if object.building %}
+ <tr>
+ <td class="tablehead">
+ {% ifequal object.checkout_type "delivery" %}
+ Delivery
+ {% endifequal %}
+ Location
+ </td>
+ <td>{{ object.building.name }} {{ object.room }}</td>
+ </tr>
+ {% endif %}
+ {% if object.location_text %}
+ <tr>
+ <td class="tablehead">Other location</td>
+ <td>{{ object.location_text }}</td>
+ </tr>
+ {% endif %}
+ {% if object.returning_person %}
+ <tr>
+ <td class="tablehead">Returning person</td>
+ <td>{{ object.returning_person }}</td>
+ </tr>
+ {% endif %}
</table>
- <h3>Description</h3>
- <p>{{ object.description }}</p>
+
+ <h3>Equipment needed</h3>
+ <p>{{ object.equipment_needed }}</p>
+
<div class="right">
- <h3>Technician information</h3>
+ <h3>Personnel information</h3>
<table>
- {% if object.technician or object.tech_legacy %}<tr><td class="tablehead">Name</td><td>{% if object.technician %}<a href="{% url etcetera-user object.technician.username %}">{{ object.technician.get_full_name }}</a>{% else %}{{ object.tech_legacy }}{% endif %}</td></tr>{% endif %}
- {% if object.technician %}<tr><td class="tablehead">Email</td><td><a href="mailto:{{ object.technician.email }}">{{ object.technician.email }}</a></td></tr>{% endif %}
+ {% if object.creating_user %}
+ <tr>
+ <td class="tablehead">Created by</td>
+ <td>
+ <a href="{% url etcetera-user object.creating_user.username %}">
+ {{ object.creating_user.get_full_name }}
+ </a>
+ </td>
+ </tr>
+ {% endif %}
+ {% if object.delivering_user %}
+ <tr>
+ <td class="tablehead">Delivered by</td>
+ <td>
+ <a href="{% url etcetera-user object.delivering_user.username %}">
+ {{ object.delivering_user.get_full_name }}
+ </a>
+ </td>
+ </tr>
+ {% endif %}
</table>
</div>
+
<h3>Actions taken</h3>
- <p>{% if object.actions %}{{ object.actions }}{% else %}No actions have been performed on this ticket yet.{% endif %}</p>
- <h3>Financial information</h3>
- <table>
- {% if object.labor %}<tr><td class="tablehead">Labor hours</td><td>{{ object.labor }}</td></tr>{% endif %}
- {% if object.material_costs %}<tr><td class="tablehead">Material costs</td><td>{{ object.material_costs|money }}</td></tr>{% endif %}
- {% if object.funding_source %}<tr><td class="tablehead">Funding source</td><td>{{ object.get_funding_source_display }}</td></tr>{% endif %}
- {% if object.budget %}<tr><td class="tablehead">Budget</td><td>{{ object.budget }}</td></tr>{% endif %}
- </table>
+ <p>
+ {% if object.actions %}
+ {{ object.actions }}
+ {% else %}
+ No actions have been performed on this ticket yet.
+ {% endif %}
+ </p>
+
+ <h3>Equipment list</h3>
+ {% if object.equipment_list.all %}
+ <table id="list">
+ <tr id="headerrow">
+ <td>Barcode</td>
+ <td>Type</td>
+ <td>Make/Model</td>
+ <td>Serial</td>
+ </tr>
+ {% for item in object.equipment_list.all %}
+ <tr class="datarow">
+ <td>
+ <a href="{% url equipment-detail item.id %}">
+ {{ item.barcode }}
+ </a>
+ </td>
+ <td>
+ <a href="{% url equipment-detail item.id %}">
+ {{ item.equipment_type.name }}
+ </a>
+ </td>
+ <td>
+ <a href="{% url equipment-detail item.id %}">
+ {{ item.make.name }} {{ item.model }}
+ </a>
+ </td>
+ <td>
+ <a href="{% url equipment-detail item.id %}">
+ {{ item.serial }}
+ </a>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+ {% else %}
+ <p>No specific equipment has been attached to this checkout yet.</p>
+ {% endif %}
+
+ <h3>Other equipment</h3>
+ {% if object.other_equipment %}
+ <p>{{ object.other_equipment }}</p>
+ {% else %}
+ <p>No extra equipment (cables, adapters, etc.) have been
+ attached to this checkout.</p>
+ {% endif %}
+
+ {% if object.software %}
+ <h3>Software</h3>
+ <p>{{ object.software }}</p>
+ {% endif %}
+
</div>
{% endblock %}
\ No newline at end of file
templates/checkout/detail.html
@@ -26,7 +26,7 @@
<td>Type</td>
</tr>
{% for object in paged_objects.object_list %}
- <tr id="datarow">
+ <tr class="datarow">
<td><a href="{% url checkout-detail object.id %}">{{ object.first_name }} {{ object.last_name }}</a></td>
<td><a href="{% url checkout-detail object.id %}">{% if object.department %}{{ object.department }}{% else %}{{ object.department_text }}{% endif %}</a></td>
<td><a href="{% url checkout-detail object.id %}">{{ object.equipment_needed }}</a></td>
templates/checkout/index.html
f4ba4f5cc516550c7512112145e1502103689352
Benjamin Kreeger
benjaminkreeger@gmail.com
http://github.com/kreeger/etcetera/commit/8b1150988df6cfbd4ffa2696d86762eef5ca7f55
8b1150988df6cfbd4ffa2696d86762eef5ca7f55
2009-10-27T12:18:24-07:00
2009-10-09T12:57:43-07:00
Detail is pretty much finished. Next big leap: creation form. Then the editing form. Then the internal creation form. Joy.
0f8c9d81e8270721c0957ffbd4ab06e0d62ac1a2
Benjamin Kreeger
benjaminkreeger@gmail.com