Merge commit '289556771efd2d74f51afa16ce504ab00a9ee40c' into purchase-order

RIGS/templates/RIGS/event_form.html

@@ -6,7 +6,8 @@
     {{ object.pk }}{% endif %}{% else %}New Event{% endif %}{% endblock %}
 
 {% block css %}
-    <link href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"/>
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
 {% endblock %}
 
 {% block js %}
@@ -14,6 +15,9 @@
     <script src="{% static "js/interaction.js" %}"></script>
     <script src="{% static "js/modal.js" %}"></script>
 
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+
     <script src="{% static "js/autocompleter.js" %}"></script>
 
     <script>
@@ -62,6 +66,43 @@
                     }
                 })
             {% endif %}
+
+            function supportsDate() {
+                //return false; //for development
+                var input = document.createElement('input');
+                input.setAttribute('type','date');
+                var notADateValue = 'not-a-date';
+                input.setAttribute('value', notADateValue); 
+                return !(input.value === notADateValue);
+            }
+            if(supportsDate()){
+                //Good, we'll use the browser implementation
+            }else{
+                //Rubbish browser - do JQuery backup
+                $('<link>')
+                  .appendTo('head')
+                  .attr({type : 'text/css', rel : 'stylesheet'})
+                  .attr('href', '{% static "css/bootstrap-datetimepicker.min.css" %}');
+                $.when(
+                    $.getScript( "{% static "js/moment.min.js" %}" ),
+                    $.getScript( "{% static "js/bootstrap-datetimepicker.min.js" %}" ),
+                    $.Deferred(function( deferred ){
+                        $( deferred.resolve );
+                    })
+                ).done(function(){
+                    $('input[type=date]').attr('type','text').datetimepicker({
+                        format: 'YYYY-MM-DD',
+                    });
+                    $('input[type=time]').attr('type','text').datetimepicker({
+                        format: 'HH:mm',
+                    });
+                    $('input[type=datetime-local]').attr('type','text').datetimepicker({
+                        format: 'YYYY-MM-DD[T]HH:mm',
+                        sideBySide: true,
+                    });
+                });
+
+            }
         })
 
         $(document).ready(function () {
@@ -123,15 +164,12 @@
 
                     <div class="col-sm-8">
                         <div class="row">
-                            <input type="hidden" id="{{ form.person.id_for_label }}" name="{{ form.person.name }}"
-                                   value="{{ form.person.value|default_if_none:"" }}"/>
-
                             <div class="col-sm-9 col-md-7 col-lg-8">
-                                <input type="text" id="{{ form.person.id_for_label }}-input"
-                                       class="form-control autocomplete-json autocomplete-update"
-                                       value="{{ person|default_if_none:"" }}"
-                                       data-sourceurl="{% url 'api_secure' model='person' %}"
-                                       data-target="{{ form.person.id_for_label }}"/>
+                                <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
+                                    {% if person %}
+                                        <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
+                                    {% endif %}
+                                </select>
                             </div>
                             <div class="col-sm-3 col-md-5 col-lg-4 align-right">
                                 <div class="btn-group">
@@ -139,7 +177,7 @@
                                        data-target="#{{ form.person.id_for_label }}">
                                         <span class="glyphicon glyphicon-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">
+                                    <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="glyphicon glyphicon-pencil"></span>
                                     </a>
                                 </div>
@@ -153,16 +191,12 @@
 
                     <div class="col-sm-8">
                         <div class="row">
-                            <input type="hidden" id="{{ form.organisation.id_for_label }}"
-                                   name="{{ form.organisation.name }}"
-                                   value="{{ form.organisation.value|default_if_none:"" }}"/>
-
                             <div class="col-sm-9 col-md-7 col-lg-8">
-                                <input type="text" id="{{ form.organisation.id_for_label }}-input"
-                                       class="form-control autocomplete-json autocomplete-update"
-                                       value="{{ organisation|default_if_none:"" }}"
-                                       data-sourceurl="{% url 'api_secure' model='organisation' %}"
-                                       data-target="{{ form.organisation.id_for_label }}"/>
+                                <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}">
+                                    {% if organisation %}
+                                        <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
+                                    {% endif %}
+                                </select>
                             </div>
                             <div class="col-sm-3 col-md-5 col-lg-4 align-right">
                                 <div class="btn-group">
@@ -170,7 +204,7 @@
                                        data-target="#{{ form.organisation.id_for_label }}">
                                         <span class="glyphicon glyphicon-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">
+                                    <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="glyphicon glyphicon-pencil"></span>
                                     </a>
                                 </div>
@@ -216,15 +250,12 @@
 
                         <div class="col-sm-8">
                             <div class="row">
-                                <input type="hidden" id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}"
-                                       value="{{ form.venue.value|default_if_none:"" }}"/>
-
                                 <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <input type="text" id="{{ form.venue.id_for_label }}-input"
-                                           class="form-control autocomplete-json autocomplete-update"
-                                           value="{{ venue|default_if_none:"" }}"
-                                           data-sourceurl="{% url 'api_secure' model='venue' %}"
-                                           data-target="{{ form.venue.id_for_label }}"/>
+                                    <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                    {% if venue %}
+                                        <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
+                                    {% endif %}
+                                    </select>
                                 </div>
                                 <div class="col-sm-3 col-md-5 col-lg-4 align-right">
                                     <div class="btn-group">
@@ -232,7 +263,7 @@
                                            data-target="#{{ form.venue.id_for_label }}">
                                             <span class="glyphicon glyphicon-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">
+                                        <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="glyphicon glyphicon-pencil"></span>
                                         </a>
                                     </div>
@@ -325,14 +356,11 @@
                                    class="col-sm-4 control-label">{{ form.mic.label }}</label>
 
                             <div class="col-sm-8">
-                                <input type="hidden" id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}"
-                                       value="{{ form.mic.value|default_if_none:"" }}"/>
-
-                                <input type="text" id="{{ form.mic.id_for_label }}-input"
-                                       class="form-control autocomplete-json"
-                                       data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials"
-                                       data-target="{{ form.mic.id_for_label }}"
-                                       value="{{ mic.name|default_if_none:"" }}"/>
+                                <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                    {% if mic %}
+                                        <option value="{{form.mic.value}}" selected="selected" >{{ mic.name }}</option>
+                                    {% endif %}
+                                </select>
                             </div>
                         </div>
 
@@ -342,15 +370,11 @@
                                        class="col-sm-4 control-label">{{ form.checked_in_by.label }}</label>
 
                                 <div class="col-sm-8">
-                                    <input type="hidden" id="{{ form.checked_in_by.id_for_label }}"
-                                           name="{{ form.checked_in_by.name }}"
-                                           value="{{ form.checked_in_by.value|default_if_none:"" }}"/>
-
-                                    <input type="text" id="{{ form.checked_in_by.id_for_label }}-input"
-                                           class="form-control autocomplete-json"
-                                           data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials"
-                                           data-target="{{ form.checked_in_by.id_for_label }}"
-                                           value="{{ checked_in_by.name|default_if_none:"" }}"/>
+                                     <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                        {% if checked_in_by %}
+                                            <option value="{{form.checked_in_by.value}}" selected="selected" >{{ checked_in_by.name }}</option>
+                                        {% endif %}
+                                    </select>
                                 </div>
                             </div>
                         {% endif %}

RIGS/templates/RIGS/invoice_detail.html

@@ -6,7 +6,7 @@
     <div class="col-sm-12">
         <div class="row">
             <div class="col-sm-8">
-                <h2>Invoice {{ object.pk }}</h2>
+                <h2>Invoice {{ object.pk }} ({{ object.invoice_date|date:"d/m/Y"}})</h2>
             </div>
 
             <div class="col-sm-4 text-right">
@@ -40,7 +40,7 @@
                             <dd>N{{ object.event.pk|stringformat:"05d" }}</dd>
 
                             <dt>Event</dt>
-                            <dd>{{ objet.event.pk }}</dd>
+                            <dd>{{ object.event.name }}</dd>
 
                             <dt>Event Venue</dt>
                             <dd>{{ object.event.venue }}</dd>
@@ -48,6 +48,12 @@
                             <dt>Event MIC</dt>
                             <dd>{{ object.event.mic.name }}</dd>
 
+                            <dt>Event Starts</dt>
+                            <dd>{{ object.event.start_date|date:"d M Y" }} {{ object.event.start_time|date:"H:i" }}</dd>
+
+                            <dt>Event Ends</dt>
+                            <dd>{{ object.event.end_date|date:"d M Y" }} {{ object.event.end_time|date:"H:i" }}</dd>
+
                             <dt>Status</dt>
                             <dd>{{ object.event.get_status_display }}</dd>
 

RIGS/templates/RIGS/organisation_list.html

@@ -24,8 +24,8 @@
                     </div>
                 </form>
             </div>
+            <div class="text-right col-sm-12">{% paginator %}</div>            
         </div>
-        <div class="pull-right">{% paginator %}</div>
         <div>
             <table class="table table-striped">
                 <thead>

RIGS/templates/RIGS/person_list.html

@@ -24,8 +24,8 @@
                     </div>
                 </form>
             </div>
+            <div class="text-right col-sm-12">{% paginator %}</div>
         </div>
-        <div class="pull-right">{% paginator %}</div>
         <div>
             <table class="table table-striped">
                 <thead>

RIGS/templates/RIGS/profile_detail.html

@@ -48,7 +48,7 @@
 		{% if object.pk == user.pk %}
 		
 		<div class="pull-right">
-			<a href="{% url 'reset_api_key' %}" class="btn">
+			<a href="{% url 'reset_api_key' %}" class="btn btn-default">
 				{% if user.api_key %}Reset API Key{% else %}Generate API Key{% endif %}
 				<span class="glyphicon glyphicon-repeat"></span>
 			</a>
@@ -70,9 +70,12 @@
 			<dd>
 				{% if user.api_key %}
 					<pre>http{{ request.is_secure|yesno:"s,"}}://{{ request.get_host }}{% url 'ics_calendar' api_pk=user.pk api_key=user.api_key %}</pre>
+					<small><a href="http://www.google.com/calendar/render?cid=http{{ request.is_secure|yesno:"s,"}}://{{ request.get_host }}{% url 'ics_calendar' api_pk=user.pk api_key=user.api_key %}">Click here</a> to add to google calendar.<br/>
+					To sync from google calendar to mobile device, visit <a href="https://www.google.com/calendar/syncselect" target="_blank">this page</a> on your device and tick "PyRIGS Calendar".</small>
 				{% else %}
 					<pre>No API Key Generated</pre>
 				{% endif %}
+				
 			</dd>
 		</dl>
 

RIGS/templates/RIGS/venue_list.html

@@ -24,8 +24,9 @@
                     </div>
                 </form>
             </div>
+            <div class="text-right col-sm-12">{% paginator %}</div>
         </div>
-        <div class="pull-right">{% paginator %}</div>
+        
         <div>
             <table class="table table-striped">
                 <thead>