Merge branch 'release/v1.1.2'

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] changes
 
+## [v1.1.2] - 2018-08-19
+### Fixed
+- Fixed issue with Transaction datepicker not loading
+
+## [v1.1.1] - 2018-07-25
+### Fixed
+- Remove unnecessary devise controllers that were causing problems with deployment
+
 ## [v1.1.0] - 2018-07-24
 ### Added
 - Major overhaul of the user interface using Material Design
@@ -18,7 +26,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Account starting balance is no longer changeable after creation
 
-
 ## [v1.0.2] - 2018-05-18
 ### Added
 - Transactions can now have attachments! You can now save invoices or receipts alongside your transactions.  
@@ -41,7 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Account overview with list of all accounts and balances for each
 
 
-[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.1.2...HEAD
+[v1.1.1]: https://github.com/odinsride/olubalance/compare/v1.1.0...v1.1.1
 [v1.1.0]: https://github.com/odinsride/olubalance/compare/v1.0.2...v1.1.0
 [v1.0.2]: https://github.com/odinsride/olubalance/compare/v1.0.1...v1.0.2
 [v1.0.1]: https://github.com/odinsride/olubalance/compare/v1.0...v1.0.1

app/assets/javascripts/application.js

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery.turbolinks
 //= require rails-ujs
 //= require turbolinks
 //= require materialize-sprockets

app/views/transactions/_form.html.erb

@@ -18,7 +18,12 @@
 
 		<div class="row">
 			<!-- Transaction Date -->
-			<%= f.input :trx_date, as: :date, html5: true, :label => 'Transaction Date', icon: 'date_range', wrapper_html: { class: 'l4 s7' }, input_html: { value: (@transaction.trx_date.present?) ? @transaction.trx_date.strftime('%d %B, %Y') : Time.now.strftime('%d %B, %Y') } %>
+        	<div class="input-field col l4 s7">
+				<i class="material-icons prefix ob-text-primary">date_range</i>
+				<%= f.text_field :trx_date, class:"datepicker", value: (@transaction.trx_date.present?) ? @transaction.trx_date.strftime('%d %B, %Y') : Time.now.strftime('%d %B, %Y') %>
+				<%= f.label :trx_date, :label => 'Transaction Date' %>
+			</div>
+
 			<!-- Transaction Type -->
 			<%= f.input :trx_type, as: :radio_buttons, collection: [['Credit', 'credit'], ['Debit', 'debit']], wrapper_html: { class: 'l2 s5' }, :label => 'Transaction Type', :item_wrapper_tag => :div, :checked => @transaction.transaction_type, id: 'trx_type' %>
 		</div>
@@ -56,4 +61,12 @@
 		</div>
 
 	<% end %>
+
+	<script type="text/javascript">
+$('.datepicker').pickadate({
+  selectMonths: true, // Creates a dropdown to control month
+  selectYears: 15 // Creates a dropdown of 15 years to control year
+});
+</script>
+
 </div>