arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-19 12:59:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into revision-view

Browse Source
This commit is contained in:
David Taylor
2015-05-21 17:01:59 +01:00
parent a6836f8139 0b787aeb33
commit 77c4a72900
13 changed files with 81 additions and 17613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
PyRIGS/.slugignore → .slugignore
View File

2
RIGS/static/css/fullcalendar.css
View File

@@ -78,7 +78,7 @@ body .fc { /* extra precedence to overcome jqui */
font-size: 1em;
text-align: center;
overflow: hidden;
font-family: "Courier New", Courier, monospace;
font-family: "Open Sans", sans-serif;
}
/*

8551
RIGS/static/css/print.css
View File

File diff suppressed because one or more lines are too long

9023
RIGS/static/css/screen.css
View File

File diff suppressed because one or more lines are too long

2
RIGS/static/scss/_bootstrap-variables.scss
View File

@@ -43,7 +43,7 @@ $link-hover-color: darken($link-color, 15%) !default;
//
//## Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;

11
RIGS/static/scss/screen.scss
View File

@@ -52,3 +52,14 @@ textarea {
.item-description {
margin-left: 1em;
}
.overflow-ellipsis {
text-overflow: ellipsis;
display: inline-block;
max-width: 100%;
overflow: hidden;
}
.modal-dialog {
z-index: inherit; // bug fix introduced in 52682ce
}

12
RIGS/templates/RIGS/event_detail.html
View File

@@ -1,13 +1,15 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
{% block title %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}
{% endif %}{% endblock %}
{% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
{% block content %}
<div class="row">
{% if not request.is_ajax %}
<div class="col-sm-12">
<div class="col-sm-8">
<h1>Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}</h1>
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }}
</h1>
</div>
</div>
<div class="col-sm-12 text-right">
@@ -53,7 +55,7 @@
<dt>Email</dt>
<dd>
<a href="mailto:{{object.person.email}}" target="_blank">
{{ object.person.email }}
<span class="overflow-ellipsis">{{ object.person.email }}</span>
</a>
</dd>
@@ -93,7 +95,7 @@
{% endif %}
<div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
<div class="panel panel-info">
<div class="panel-heading">{{ object.name }}</div>
<div class="panel-heading">Event Info</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>Event Venue</dt>

27
RIGS/templates/RIGS/event_form.html
View File

@@ -401,15 +401,16 @@
</div>
</div>
</div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
</div>
<!-- /.col-sm-12 .col-md-6 -->
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
{# Notes and item shit #}
<div class="col-sm-12">
@@ -424,12 +425,12 @@
{% include "RIGS/item_table.html" %}
</div>
</div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
<div class="col-sm-12 text-right form-hws form-is_rig">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
</form>

3
RIGS/templates/RIGS/index.html
View File

@@ -13,6 +13,9 @@
{% endif %}
<h3>There are currently {{ rig_count }} rigs coming up.</h3>
<a class="btn btn-default" href="{% url 'rigboard' %}">View Rigboard</a>
<a class="btn btn-default" href="{% url 'event_create' %}">
New Event <span class="glyphicon glyphicon-plus"></span>
</a>
</div>
</div>
<div class="col-sm-6">

2
RIGS/templates/RIGS/invoice_detail.html
View File

@@ -11,7 +11,7 @@
<div class="col-sm-4 text-right">
<a href="{% url 'invoice_void' object.pk %}" class="btn btn-default" title="Void Invoice">
<span class="glyphicon glyphicon-text-background"></span>
<span class="glyphicon glyphicon-ban-circle"></span>
</a>
</div>
</div>

4
RIGS/templates/RIGS/profile_detail.html
View File

@@ -34,10 +34,10 @@
<dd>{{object.email}}</dd>
<dt>Last Login</dt>
<dd>{{object.last_login}}</dd>
<dd>{{object.last_login|date:"d/m/Y H:i"}}</dd>
<dt>Date Joined</dt>
<dd>{{object.date_joined}}</dd>
<dd>{{object.date_joined|date:"d/m/Y H:i"}}</dd>
<dt>Initials</dt>
<dd>{{object.initials}}</dd>

47
RIGS/views.py
View File

@@ -9,6 +9,7 @@ from django.core import serializers
import simplejson
from django.contrib import messages
import datetime
import operator
from RIGS import models, forms
@@ -253,27 +254,37 @@ class SecureAPIRequest(generic.View):
# Supply data for autocomplete ajax request in json form
term = request.GET.get('term', None)
if term:
if fields is None:
if fields is None: # Default to just name
fields = ['name']
all_objects = self.models[model].objects
# Build a list of Q objects for use later
queries = []
for part in term.split(" "):
qs = []
for field in fields:
q = Q(**{field + "__icontains": part})
qs.append(q)
queries.append(reduce(operator.or_, qs))
# Build the data response list
results = []
for field in fields:
filter = field + "__icontains"
objects = all_objects.filter(**{filter: term})
for o in objects:
data = {
'pk': o.pk,
'value': o.pk,
'label': o.name,
}
query = reduce(operator.and_, queries)
objects = self.models[model].objects.filter(query)
for o in objects:
data = {
'pk': o.pk,
'value': o.pk,
'label': o.name,
}
try: # See if there is a valid update URL
data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
except NoReverseMatch:
pass
results.append(data)
try: # See if there is an update url or don't bother with it otherwise
data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
except NoReverseMatch:
pass
results.append(data)
json = simplejson.dumps(results[:20])
# return a data response
json = simplejson.dumps(results)
return HttpResponse(json, content_type="application/json") # Always json
start = request.GET.get('start', None)

8
templates/base.html
View File

@@ -11,6 +11,11 @@
<meta name="viewport" content="initial-scale=1">
<link rel="icon" type="image/png" href="/static/imgs/pyrigs-avatar.png">
<link rel="apple-touch-icon" href="/static/imgs/pyrigs-avatar.png">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
{% block css %}
{% endblock %}
@@ -44,6 +49,7 @@
<li><a href="{% url 'rigboard' %}">Rigboard</a></li>
<li><a href="{% url 'event_archive' %}">Archive</a></li>
<li><a href="{% url 'web_calendar' %}">Calendar</a></li>
<li><a href="{% url 'event_create' %}">New</a></li>
</ul>
</li>
{% if perms.RIGS.view_invoice %}
@@ -135,7 +141,7 @@
</div>
</div>
<div class="modal fade" id="modal"></div>
<div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
<script>
Date.prototype.getISOString = function () {