arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-15 11:09:42 +00:00
Code Issues Projects Releases Wiki Activity

Re-enable calendar

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-10 18:03:05 +00:00
parent 4d845309c9
commit 88ac1b93ae
22 changed files with 112 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIGS/rigboard.py
View File

@@ -128,6 +128,7 @@ class EventCreate(generic.CreateView):
class EventUpdate(generic.UpdateView):
model = models.Event
form_class = forms.EventForm
template_name = 'event_form.html'
def get_context_data(self, **kwargs):
context = super(EventUpdate, self).get_context_data(**kwargs)

6
RIGS/static/css/fullcalendar.css Normal file
View File

File diff suppressed because one or more lines are too long

6
RIGS/static/js/fullcalendar.js Normal file
View File

File diff suppressed because one or more lines are too long

1
RIGS/static/js/moment.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
RIGS/templates/calendar.html
View File

@@ -187,9 +187,7 @@
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-12">
<div class="pull-left">
<span id="calendar-header" class="h2"></span>

6
RIGS/templates/client_eventdetails.html
View File

@@ -1,7 +1,7 @@
<div class="row">
<div class="col-sm-12 col-md-6 col-lg-5">
<div class="card card-default">
<div class="card-heading">Contact Details</div>
<div class="card-header">Contact Details</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Person</dt>
@@ -23,7 +23,7 @@
</div>
{% if event.organisation %}
<div class="card card-default">
<div class="card-heading">Organisation</div>
<div class="card-header">Organisation</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Organisation</dt>
@@ -41,7 +41,7 @@
<div class="col-sm-12 col-md-6 col-lg-7">
<div class="card card-info">
<div class="card-heading">Event Info</div>
<div class="card-header">Event Info</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Event Venue</dt>

5
RIGS/templates/event_archive.html
View File

@@ -10,27 +10,22 @@
</div>
<div class="col-sm-12">
<form class="form-inline">
<div class="input-group">
<div class="input-group-addon">Start</div>
<input type="date" name="start" id="start" value="{{ start|default_if_none:"" }}" placeholder="Start" class="form-control" />
</div>
<div class="input-group">
<div class="input-group-addon">End</div>
<input type="date" name="end" id="end" value="{{ end|default_if_none:"" }}" placeholder="End" class="form-control" />
</div>
<div class="input-group">
<div class="input-group-addon">Keyword</div>
<input type="search" name="q" placeholder="Keyword" value="{{ request.GET.q }}"
class="form-control"/>
</div>
<div class="input-group">
<input type="submit" class="btn btn-primary" value="Search"/>
</div>
</form>
</div>

34
RIGS/templates/event_detail.html
View File

@@ -4,28 +4,27 @@
{% block content %}
<div class="row">
{% if not request.is_ajax %}
<div class="col-sm-12">
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
</h1>
</div>
<div class="col-sm-12">
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }} {% if event.dry_hire %}<span class="badge badge-secondary">Dry Hire</span>{% endif %}
</h1>
</div>
{% if perms.RIGS.view_event %}
<div class="col-sm-12 text-right">
{% include 'event_detail_buttons.html' %}
</div>
{% endif %}
{% endif %}
{% if object.is_rig and perms.RIGS.view_event %}
{# only need contact details for a rig #}
<div class="col-sm-12 col-md-6 col-lg-5">
<div class="card card-default">
<div class="card-heading">Contact Details</div>
<div class="card-header">Contact Details</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Person</dt>
<dd>
<dd
{% if object.person %}
<a href="{% url 'person_detail' object.person.pk %}" class="modal-href">
{{ object.person }}
@@ -47,7 +46,7 @@
</div>
{% if event.organisation %}
<div class="card card-default">
<div class="card-heading">Organisation</div>
<div class="card-header">Organisation</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Organisation</dt>
@@ -76,7 +75,7 @@
{% endif %}
<div class="col-sm-12 {% if event.is_rig and perms.RIGS.view_event %}col-md-6 col-lg-7{% endif %}">
<div class="card card-info">
<div class="card-heading">Event Info</div>
<div class="card-header">Event Info</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Event Venue</dt>
@@ -169,7 +168,7 @@
card-info
{% endif %}
">
<div class="card-heading">Client Authorisation</div>
<div class="card-header">Client Authorisation</div>
<div class="card-body">
<dl class="dl-horizontal col-sm-6">
<dt>Authorisation Request</dt>
@@ -222,14 +221,17 @@
{% if event.is_rig %}
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading">Event Details</div>
<div class="card-header">Event Details</div>
<div class="card-body">
{% if perms.RIGS.view_event %}
<div class="well well-sm">
<h4>Notes</h4>
<div class="dont-break-out">{{ event.notes|linebreaksbr }}</div>
<div class="card bg-secondary">
<div class="card-header">Notes</div>
<div class="card-body">
<p class="dont-break-out">{{ event.notes|linebreaksbr }}</p>
</div>
</div>
{% endif %}
<br>
{% include 'item_table.html' %}
</div>
</div>

22
RIGS/templates/event_form.html
View File

@@ -136,7 +136,7 @@
<div class="col-sm-4 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="fas fa-floppy-disk"></span></button>
class="fas fa-save"></span></button>
</div>
</div>
</div>
@@ -167,7 +167,7 @@
{# Contact details #}
<div class="col-sm-12 col-md-6">
<div class="card card-default form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
<div class="card-heading">Contact Details</div>
<div class="card-header">Contact Details</div>
<div class="card-body">
<div class="form-group" data-toggle="tooltip" title="The main contact for the event, can be left blank if purely an organisation">
<label for="{{ form.person.id_for_label }}"
@@ -189,7 +189,7 @@
<span class="fas fa-plus"></span>
</a>
<a href="{% if form.person.value %}{% url 'person_update' form.person.value %}{% endif %}" class="btn btn-default modal-href" id="{{ form.person.id_for_label }}-update" data-target="#{{ form.person.id_for_label }}">
<span class="fas fa-pencil"></span>
<span class="fas fa-user-edit"></span>
</a>
</div>
</div>
@@ -216,7 +216,7 @@
<span class="fas fa-plus"></span>
</a>
<a href="{% if form.organisation.value %}{% url 'organisation_update' form.organisation.value %}{% endif %}" class="btn btn-default modal-href" id="{{ form.organisation.id_for_label }}-update" data-target="#{{ form.organisation.id_for_label }}">
<span class="fas fa-pencil"></span>
<span class="fas fa-edit"></span>
</a>
</div>
</div>
@@ -226,7 +226,7 @@
</div>
</div>
<div class="card card-default form-hws form-non_rig">
<div class="card-heading">Event Description</div>
<div class="card-header">Event Description</div>
<div class="card-body">
<div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">
<label for="{{ form.description.id_for_label }}"
@@ -244,7 +244,7 @@
{# Event details #}
<div class="col-sm-12 col-md-6">
<div class="card card-default form-hws form-non_rig">
<div class="card-heading">Event Details</div>
<div class="card-header">Event Details</div>
<div class="card-body">
<div id="form-hws">
<div class="form-group" data-toggle="tooltip" title="Name of the event, displays on rigboard and on paperwork">
@@ -275,7 +275,7 @@
<span class="fas fa-plus"></span>
</a>
<a href="{% if object.venue %}{% url 'venue_update' object.venue.pk %}{% endif %}" class="btn btn-default modal-href" id="{{ form.venue.id_for_label }}-update" data-target="#{{ form.venue.id_for_label }}">
<span class="fas fa-pencil"></span>
<span class="fas fa-edit"></span>
</a>
</div>
</div>
@@ -416,12 +416,11 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="fas fa-floppy-disk"></span>
class="fas fa-save"></span>
</button>
</div>
</div>
{# Notes and item shit #}
<div class="col-sm-12">
<div class="card card-default form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
@@ -432,18 +431,17 @@
{% render_field form.notes class+="form-control" %}
</div>
</div>
{% include 'item_table.html" %}
{% include 'item_table.html' %}
</div>
</div>
</div>
<div class="col-sm-12 text-right form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="fas fa-floppy-disk"></span>
class="fas fa-save"></span>
</button>
</div>
</div>
</form>
{% include 'item_modal.html' %}
{% endblock %}

2
RIGS/templates/eventauthorisation_form.html
View File

@@ -47,7 +47,7 @@
<div class="row">
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading" id="eventauth">Event Authorisation</div>
<div class="card-header" id="eventauth">Event Authorisation</div>
<div class="card-body">
<form class="form-horizontal itemised_form" role="form" method="POST" action="#eventauth">

2
RIGS/templates/eventauthorisation_success.html
View File

@@ -28,7 +28,7 @@
<div class="row">
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading">Event Authorisation</div>
<div class="card-header">Event Authorisation</div>
<div class="card-body">
<div class="row">

4
RIGS/templates/invoice_detail.html
View File

@@ -29,7 +29,7 @@
<div class="row">
<div class="col-sm-6">
<div class="card card-default">
<div class="card-heading">Invoice Details</div>
<div class="card-header">Invoice Details</div>
<div class="card-body">
{% if object.event.organisation %}
{{ object.event.organisation.name }}<br/>
@@ -43,7 +43,7 @@
</div>
<div class="col-sm-6">
<div class="card card-{% if object.is_closed %}success{% else %}warning{% endif %}">
<div class="card-heading">Event Details<span class="pull-right">
<div class="card-header">Event Details<span class="pull-right">
{% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
</span>
</div>

6
RIGS/templates/item_table.html
View File

@@ -1,4 +1,4 @@
<div class="card table-responsive">
<div class="table-responsive">
<table class="table table-hover" id="item-table" {% if edit %}data-orderurl="{#% url 'item_order' %#}"{% endif %}>
<thead>
<tr>
@@ -66,10 +66,10 @@
<td class="vert-align text-right">
<button type="button" class="item-edit btn btn-xs btn-default"
data-toggle="modal" data-target="#itemModal">
<span class="fas fa-edit"></span>
<i class="fas fa-edit"></i>
</button>
<button type="button" class="item-delete btn btn-xs btn-danger">
<span class="fas fa-remove"></span>
<i class="fas fa-times-circle"></i>
</button>
</td>
{% endif %}

6
RIGS/templates/organisation_detail.html
View File

@@ -19,7 +19,7 @@
{% endif %}
<div class="col-sm-6">
<div class="card card-info">
<div class="card-heading">Organisation Details</div>
<div class="card-header">Organisation Details</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Name</dt>
@@ -46,7 +46,7 @@
<div class="col-sm-6">
<div class="card card-default">
<div class="card-heading">Associated People</div>
<div class="card-header">Associated People</div>
<div class="card-body">
<div class="list-group">
{% for person,count in object.persons %}
@@ -61,7 +61,7 @@
<div class="row">
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading">Associated Events</div>
<div class="card-header">Associated Events</div>
<div class="card-body">
{% with object.latest_events as events %}
{% include 'event_table.html' %}

6
RIGS/templates/person_detail.html
View File

@@ -19,7 +19,7 @@
{% endif %}
<div class="col-sm-6">
<div class="card card-info">
<div class="card-heading">Person Details</div>
<div class="card-header">Person Details</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Name</dt>
@@ -43,7 +43,7 @@
<div class="col-sm-6">
<div class="card card-default">
<div class="card-heading">Associated Organisations</div>
<div class="card-header">Associated Organisations</div>
<div class="card-body">
<div class="list-group">
{% for organisation,count in object.organisations %}
@@ -58,7 +58,7 @@
<div class="row">
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading">Associated Events</div>
<div class="card-header">Associated Events</div>
<div class="card-body">
{% with object.latest_events as events %}
{% include 'event_table.html' %}

6
RIGS/templates/search_help.html
View File

@@ -11,7 +11,7 @@
{% endif %}
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading">
<div class="card-header">
<h3 class="card-title">Searching Events</h3>
</div>
<div class="card-body">
@@ -28,7 +28,7 @@
</div>
<div class="card card-default">
<div class="card-heading">
<div class="card-header">
<h3 class="card-title">Searching People/Organisations/Venues</h3>
</div>
<div class="card-body">
@@ -47,7 +47,7 @@
{% if perms.RIGS.view_invoice %}
<div class="card card-default">
<div class="card-heading">
<div class="card-header">
<h3 class="card-title">Searching Invoices</h3>
</div>
<div class="card-body">

4
RIGS/templates/venue_detail.html
View File

@@ -19,7 +19,7 @@
{% endif %}
<div class="col-sm-12">
<div class="card card-info">
<div class="card-heading">Venue Details</div>
<div class="card-header">Venue Details</div>
<div class="card-body">
<dl class="dl-horizontal">
<dt>Name</dt>
@@ -48,7 +48,7 @@
<div class="row">
<div class="col-sm-12">
<div class="card card-default">
<div class="card-heading">Associated Events</div>
<div class="card-header">Associated Events</div>
<div class="card-body">
{% with object.latest_events as events %}
{% include 'event_table.html' %}

7
RIGS/templates/version_changes.html
View File

@@ -1,15 +1,12 @@
{% if version.changes.item_changes or version.changes.field_changes or version.changes.old == None %}
{% for change in version.changes.field_changes %}
<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
<button title="Changes to {{ change.field.verbose_name }}" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
{% include 'version_changes_change.html' %}
{% endspaceless %}'>{{ change.field.verbose_name }}</button>
{% endfor %}
{% for itemChange in version.changes.item_changes %}
<button title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
<button title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
<ul class="list-group">
{% for change in itemChange.field_changes %}
<li class="list-group-item">

32
RIGS/templates/version_history.html
View File

@@ -35,31 +35,23 @@
<td>Version ID</td>
<td>User</td>
<td>Changes</td>
<td>Comment</td>
</tr>
</thead>
<tbody>
{% for version in object_list %}
<tr>
<td>{{ version.revision.date_created }}</td>
<td>{{ version.pk }}|{{ version.revision.pk }}</td>
<td>{{ version.revision.user.name }}</td>
<td>
{% if version.changes.old is None %}
{{object|to_class_name}} Created
{% else %}
{% include 'version_changes.html' %}
{% endif %}
</td>
<td>
{{ version.revision.comment }}
</td>
</tr>
<tr>
<td>{{ version.revision.date_created }}</td>
<td>{{ version.pk }}|{{ version.revision.pk }}</td>
<td>{{ version.revision.user.name }}</td>
<td>
{% if version.changes.old is None %}
{{object|to_class_name}} Created
{% else %}
{% include 'version_changes.html' %}
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>

2
RIGS/urls.py
View File

@@ -105,7 +105,7 @@ urlpatterns = [
url(r'^event/(?P<pk>\d+)/duplicate/$',
permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
name='event_duplicate'),
url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
path('event/archive/', login_required()(rigboard.EventArchive.as_view()),
name='event_archive'),
url(r'^event/(?P<pk>\d+)/history/$',

4
gulpfile.js
View File

@@ -15,7 +15,7 @@ var sourcemaps = require('gulp-sourcemaps');
sass.compiler = require('node-sass');
gulp.task('sass', function () {
return gulp.src('web_assets/scss/**/*.scss')
return gulp.src(['web_assets/scss/**/*.scss', 'node_modules/fullcalendar/dist/fullcalendar.css'])
.pipe(sourcemaps.init())
.pipe(flatten())
.pipe(sass().on('error', sass.logError))
@@ -26,7 +26,7 @@ gulp.task('sass', function () {
});
gulp.task('scripts', function() {
return gulp.src(['web_assets/js/**/*.js', 'node_modules/bootstrap/**/bootstrap.min.js', 'node_modules/popper\.js/**/popper.js', 'node_modules/moment/moment.js', 'node_modules/@fortawesome/fontawesome-free/js/all.js', 'node_modules/jquery/dist/jquery.js'])
return gulp.src(['web_assets/js/**/*.js', 'node_modules/bootstrap/**/bootstrap.min.js', 'node_modules/popper\.js/**/popper.js', 'node_modules/moment/min/moment.min.js', 'node_modules/@fortawesome/fontawesome-free/js/all.js', 'node_modules/jquery/dist/jquery.js', 'node_modules/fullcalendar/dist/fullcalendar.js'])
.pipe(flatten())
.pipe(terser())
.pipe(gulp.dest('RIGS/static/js'));

58
templates/pagination.html
View File

@@ -1,36 +1,34 @@
{% if is_paginated %}
{% load url_replace from filters %}
<div>
<ul class="pagination">
{% if has_previous %}
<li><a href="?{% url_replace request 'page' previous %}" class="prev">&lsaquo;&lsaquo;</a></li>
{% else %}
<li class="disabled prev"><a href="#">&lsaquo;&lsaquo;</a></li>
{% endif %}
<ul class="pagination">
{% if has_previous %}
<li><a class="page-link" href="?{% url_replace request 'page' previous %}" class="prev">&lsaquo;&lsaquo;</a></li>
{% else %}
<li class="disabled prev"><a class="page-link" href="#" disabled>&lsaquo;&lsaquo;</a></li>
{% endif %}
{% if show_first %}
<li><a href="?{% url_replace request 'page' first %}" class="prev">{{ first }}</a></li>
<li><span>&hellip;</span></li>
{% endif %}
{% if show_first %}
<li><a class="page-link" href="?{% url_replace request 'page' first %}" class="prev">{{ first }}</a></li>
<li><span>&hellip;</span></li>
{% endif %}
{% for page in page_numbers %}
{% ifequal page page_obj.number %}
<li class="current page active"><a href="#">{{ page }}</a></li>
{% else %}
<li><a href="?{% url_replace request 'page' page %}" class="page">{{ page }}</a></li>
{% endifequal %}
{% endfor %}
{% if show_last %}
<li><span>&hellip;</span></li>
<li><a href="?{% url_replace request 'page' last %}" class="prev">{{ last }}</a></li>
{% endif %}
{% if has_next %}
<li><a href="?{% url_replace request 'page' next %}" class="next">&rsaquo;&rsaquo;</a></li>
{% for page in page_numbers %}
{% ifequal page page_obj.number %}
<li class="current page active"><a class="page-link" href="#">{{ page }}</a></li>
{% else %}
<li class="disabled next"><a href="#">&rsaquo;&rsaquo;</a></li>
{% endif %}
</ul>
</div>
<li><a class="page-link" href="?{% url_replace request 'page' page %}" class="page">{{ page }}</a></li>
{% endifequal %}
{% endfor %}
{% if show_last %}
<li><span>&hellip;</span></li>
<li><a class="page-slink" href="?{% url_replace request 'page' last %}" class="prev">{{ last }}</a></li>
{% endif %}
{% if has_next %}
<li><a class="page-link" href="?{% url_replace request 'page' next %}" class="next">&rsaquo;&rsaquo;</a></li>
{% else %}
<li class="page-link" class="disabled next"><a href="#">&rsaquo;&rsaquo;</a></li>
{% endif %}
</ul>
{% endif %}