aboutsummaryrefslogtreecommitdiffstats
path: root/servo
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2017-04-24 19:18:32 +0300
committerFilipp Lepalaan <filipp@mac.com>2017-04-24 19:18:32 +0300
commit0ff21402fa711c3e865a7c8b8b715d7dfac2f9fd (patch)
tree740d0d7dc85f1c28af3c70514acd57e4f66c242f /servo
parentf239b9716ceac0e7d3bff5e9b40dda2119a2fb88 (diff)
downloadServo-0ff21402fa711c3e865a7c8b8b715d7dfac2f9fd.tar.gz
Servo-0ff21402fa711c3e865a7c8b8b715d7dfac2f9fd.tar.bz2
Servo-0ff21402fa711c3e865a7c8b8b715d7dfac2f9fd.zip
Added queue menu to checkin/auth
Diffstat (limited to 'servo')
-rw-r--r--servo/forms/checkin.py8
-rw-r--r--servo/templates/checkin/newindex.html261
2 files changed, 138 insertions, 131 deletions
diff --git a/servo/forms/checkin.py b/servo/forms/checkin.py
index 31d28b5..b3ed0d0 100644
--- a/servo/forms/checkin.py
+++ b/servo/forms/checkin.py
@@ -17,7 +17,7 @@ from servo.validators import (apple_sn_validator,
from servo.forms.base import SearchFieldInput
from servo.models import (Configuration, Device,
Attachment, Location,
- Customer,)
+ Customer, Queue,)
# Generate list of years for purchase date picker
@@ -69,6 +69,11 @@ class DeviceForm(forms.ModelForm):
help_text=_("Please describe the condition of the device")
)
+ queue = forms.ModelChoiceField(label=_('Queue'),
+ required=False,
+ queryset=Queue.objects.all(),
+ help_text=_('Assign order to this queue'))
+
class Meta:
model = Device
fields = (
@@ -233,7 +238,6 @@ class IssueForm(forms.Form):
issue_description = forms.CharField(
min_length=10,
- #initial='Does not work very well',
label=_(u'Problem description'),
widget=forms.Textarea(attrs={'class': 'span12'})
)
diff --git a/servo/templates/checkin/newindex.html b/servo/templates/checkin/newindex.html
index 878ddea..96c8042 100644
--- a/servo/templates/checkin/newindex.html
+++ b/servo/templates/checkin/newindex.html
@@ -6,140 +6,143 @@
{% block main %}
<div class="page-header">
- <h2>{% trans "Device" %}</h2>
+ <h2>{% trans "Device" %}</h2>
</div>
{% comment %}
- <div class="container choose-device">
+ <div class="container choose-device">
<div class="row">
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=mac">
- <img src="{{ STATIC_URL }}images/checkin/mac.jpg" alt="Mac"/>
- <p>{% trans "Mac" %}</p>
- </a>
- </div>
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=iphone">
- <img src="{{ STATIC_URL }}images/checkin/iphone.jpg" alt="iPhone"/>
- <p>{% trans "iPhone" %}</p>
- </a>
- </div>
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=ipad">
- <img src="{{ STATIC_URL }}images/checkin/ipad.jpg" alt="iPad"/>
- <p>{% trans "iPad" %}</p>
- </a>
- </div>
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=ipod">
- <img src="{{ STATIC_URL }}images/checkin/ipod.jpg" alt="iPod"/>
- <p>{% trans "iPod" %}</p>
- </a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=acc">
- <img src="{{ STATIC_URL }}images/checkin/appleacc.jpg" alt="Apple Accessory"/>
- <p>{% trans "Apple Accessory" %}</p>
- </a>
- </div>
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=beats">
- <img src="{{ STATIC_URL }}images/checkin/beats.png" alt="Beats Products"/>
- <p>{% trans "Beats Products" %}</p>
- </a>
- </div>
- <div class="col-md-3">
- <a href="{% url 'checkin-new' %}?d=other">
- <img src="{{ STATIC_URL }}images/models/macbookair.jpg" alt="Other Device"/>
- <p>{% trans "Other Device" %}</p>
- </a>
- </div>
- </div>
- </div>
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=mac">
+ <img src="{{ STATIC_URL }}images/checkin/mac.jpg" alt="Mac"/>
+ <p>{% trans "Mac" %}</p>
+ </a>
+ </div>
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=iphone">
+ <img src="{{ STATIC_URL }}images/checkin/iphone.jpg" alt="iPhone"/>
+ <p>{% trans "iPhone" %}</p>
+ </a>
+ </div>
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=ipad">
+ <img src="{{ STATIC_URL }}images/checkin/ipad.jpg" alt="iPad"/>
+ <p>{% trans "iPad" %}</p>
+ </a>
+ </div>
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=ipod">
+ <img src="{{ STATIC_URL }}images/checkin/ipod.jpg" alt="iPod"/>
+ <p>{% trans "iPod" %}</p>
+ </a>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=acc">
+ <img src="{{ STATIC_URL }}images/checkin/appleacc.jpg" alt="Apple Accessory"/>
+ <p>{% trans "Apple Accessory" %}</p>
+ </a>
+ </div>
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=beats">
+ <img src="{{ STATIC_URL }}images/checkin/beats.png" alt="Beats Products"/>
+ <p>{% trans "Beats Products" %}</p>
+ </a>
+ </div>
+ <div class="col-md-3">
+ <a href="{% url 'checkin-new' %}?d=other">
+ <img src="{{ STATIC_URL }}images/models/macbookair.jpg" alt="Other Device"/>
+ <p>{% trans "Other Device" %}</p>
+ </a>
+ </div>
+ </div>
+ </div>
{% endcomment %}
<div class="container">
- <form action="{% url 'checkin-index' %}" method="post" enctype="multipart/form-data">
- {% csrf_token %}
- <div class="row" id="device_details">
- {% include "checkin/device_form.html" %}
- </div>
- <div class="page-header">
- <h2>{% trans "Customer" %}</h2>
- </div>
- <div id="customer">
- {% include "checkin/customer_form.html" %}
- </div>
- <div class="page-header">
- <h2>{% trans "Problem description" %}</h2>
- </div>
- {% if request.user.is_authenticated %}
- <div class="row">
- <div class="col-md-12">
- <div class="form-group">
- <label class="control-label">{% trans "Tags" %}</label>
- <div class="row bootstrap3-multi-input select-tags">
- {% for t in tags %}
- <div class="btn-group" data-toggle="buttons">
- <label class="btn btn-sm btn-{{ t.color|replace:"important,danger" }}">
- <input type="checkbox" name="tags" value="{{ t.id|safe }}"/> {% bootstrap_icon "tag" %} {{ t.title }}
- </label>
- </div>
- {% endfor %}
- </div>
- </div>
- </div>
- </div>
- {% endif %}
- <div class="row">
- <div class="col-md-6">
- {% bootstrap_field issue_form.issue_description %}
- {% bootstrap_field issue_form.notes %}
- {% bootstrap_field device_form.condition %}
- </div>
- <div class="col-md-6">
- {% bootstrap_field device_form.pop %}
- <table class="table">
- <thead>
- <tr>
- <th></th>
- <th>{% trans "Yes" %}</th>
- <th>{% trans "No" %}</th>
- </tr>
- </thead>
- <tbody>
- {% for q in questions %}
- <tr>
- <td>
- <strong>{{ q }}</strong>
- <p class="small">{{ q.description }}</p>
- </td>
- <td><input type="radio" name="__cl__{{ q }}" value="{% trans "Yes" %}"/></td>
- <td><input type="radio" name="__cl__{{ q }}" value="{% trans "No" %}"/></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
- {% bootstrap_field customer_form.checkin_location %}
- {% bootstrap_field customer_form.checkout_location %}
- </div>
- </div>
- <hr/>
- <div class="row">
- <div class="col-md-12">
- {% buttons %}
- {% if not request.user.is_authenticated %}
- {% bootstrap_field customer_form.agree_to_terms %}
- {% endif %}
- {% if request.user.is_authenticated %}
- <button type="submit" id="id_btn_submit" class="btn btn-primary pull-right">{% trans "Submit" %}</button>
- {% else %}
- <button type="submit" id="id_btn_submit" class="btn btn-primary pull-right" disabled="disabled">{% trans "Submit" %}</button>
- {% endif %}
- {% endbuttons %}
- </div>
- </div>
- </form>
+ <form action="{% url 'checkin-index' %}" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+ <div class="row" id="device_details">
+ {% include "checkin/device_form.html" %}
+ </div>
+ <div class="page-header">
+ <h2>{% trans "Customer" %}</h2>
+ </div>
+ <div id="customer">
+ {% include "checkin/customer_form.html" %}
+ </div>
+ <div class="page-header">
+ <h2>{% trans "Problem description" %}</h2>
+ </div>
+ {% if request.user.is_authenticated %}
+ <div class="row">
+ <div class="col-md-12">
+ <div class="form-group">
+ <label class="control-label">{% trans "Tags" %}</label>
+ <div class="">
+ {% for t in tags %}
+ <div class="btn-group" data-toggle="buttons">
+ <label class="btn btn-sm btn-{{ t.color|replace:"important,danger" }}">
+ <input type="checkbox" name="tags" value="{{ t.id|safe }}"/> {% bootstrap_icon "tag" %} {{ t.title }}
+ </label>
+ </div>
+ {% endfor %}
+ </div>
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ <div class="row">
+ <div class="col-md-6">
+ {% bootstrap_field issue_form.issue_description %}
+ {% bootstrap_field issue_form.notes %}
+ {% bootstrap_field device_form.condition %}
+ </div>
+ <div class="col-md-6">
+ {% bootstrap_field device_form.pop %}
+ <table class="table">
+ <thead>
+ <tr>
+ <th></th>
+ <th>{% trans "Yes" %}</th>
+ <th>{% trans "No" %}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for q in questions %}
+ <tr>
+ <td>
+ <strong>{{ q }}</strong>
+ <p class="small">{{ q.description }}</p>
+ </td>
+ <td><input type="radio" name="__cl__{{ q }}" value="{% trans "Yes" %}"/></td>
+ <td><input type="radio" name="__cl__{{ q }}" value="{% trans "No" %}"/></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% bootstrap_field customer_form.checkin_location %}
+ {% bootstrap_field customer_form.checkout_location %}
+ {% if request.user.is_authenticated %}
+ {% bootstrap_field device_form.queue %}
+ {% endif %}
+ </div>
+ </div>
+ <hr/>
+ <div class="row">
+ <div class="col-md-12">
+ {% buttons %}
+ {% if not request.user.is_authenticated %}
+ {% bootstrap_field customer_form.agree_to_terms %}
+ {% endif %}
+ {% if request.user.is_authenticated %}
+ <button type="submit" id="id_btn_submit" class="btn btn-primary pull-right">{% trans "Submit" %}</button>
+ {% else %}
+ <button type="submit" id="id_btn_submit" class="btn btn-primary pull-right" disabled="disabled">{% trans "Submit" %}</button>
+ {% endif %}
+ {% endbuttons %}
+ </div>
+ </div>
+ </form>
</div>
{% endblock main %}