fix conflit

app/assets/javascripts/application.js

@@ -25,6 +25,9 @@
 //= require moment
 //= require daterangepicker
 //= require select2
+//= require bootstrap-datetimepicker
+//= require pickers
+
 
 $(document).on('turbolinks:load', function() {
   $('.datepicker').datepicker({

app/assets/javascripts/origami.js

@@ -6,6 +6,7 @@
 //= require cable
 //= require jquery-ui
 //= require bootstrap-datepicker
+//= require jquery.datetimepicker
 
 $(document).ready(function(){
 	// auto refresh every 60 seconds

app/assets/stylesheets/application.scss

@@ -8,6 +8,7 @@
 @import "dataTables/jquery.dataTables";
 @import "daterangepicker-bs3";
 @import "select2";
+@import "bootstrap-datetimepicker";
 
 /* Show it is fixed to the top */
 // body {

app/assets/stylesheets/origami.scss

@@ -4,6 +4,8 @@
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
 
+@import "jquery.datetimepicker";
+
 /* Show it is fixed to the top */
 // body {
 //   min-height: 75rem;