Jad Meouchy 9 years ago
parent
commit
c684759c19

+ 0 - 0
www/images/ajax-loader-small.gif → www/css/images/ajax-loader-small.gif


+ 0 - 0
www/images/ajax-loader.gif → www/css/images/ajax-loader.gif


+ 0 - 0
www/images/calender.png → www/css/images/calender.png


+ 0 - 0
www/images/close.png → www/css/images/close.png


+ 0 - 0
www/images/shadow_left.png → www/css/images/shadow_left.png


+ 0 - 0
www/images/shadow_right.png → www/css/images/shadow_right.png


+ 1 - 0
www/index.html

@@ -42,6 +42,7 @@
 <script src="js/vendor/jquery.dataTables.min.js"></script>
 <script src="js/vendor/dataTables.editor.js"></script>
 <script src="js/vendor/dataTables.fixedColumns.min.js"></script>
+<script src="js/vendor/moment.min.js"></script>
 
 <script src="js/authorization.js"></script>
 <script src="js/helper.js"></script>

+ 34 - 8
www/js/routes.js

@@ -184,7 +184,8 @@ function createTable(id_company, table_dom)
 		}
 	});
 	
-	console.log(table_dom);
+	
+	var todo = {};
 	
 	var editor = new $.fn.dataTable.Editor(
 	{
@@ -194,25 +195,50 @@ function createTable(id_company, table_dom)
 		{
 			label: "Pickup Time:",
 			name: "time_pickup",
-			type: "datetime"
+			type: "datetime",
+			format: 'MM-DD-YYYY h:mm A'
 		},
 		{
 			label: "Depart Time:",
 			name: "time_depart",
-			type: "datetime"
+			type: "datetime",
+			format: 'MM-DD-YYYY h:mm A'
 		},
 		{
 			label: "BOL Delivered:",
-			name: "bol_delivered"
-		}]
+			name: "bol_delivered",
+			type: "datetime",
+			format: 'MM-DD-YYYY h:mm A'
+		}],
+		ajax: function(method, url, d, success, error)
+		{
+			//var output = { data: [] };
+			
+			console.log(d);
+ 
+			success(d);
+		}
 	});
 	
+	
 	//attach the editor
-	$(table_dom).on('click', 'td.time_pickup, td.time_depart, td.bol_delivered', function(e) {
+	$(table_dom).on('click', 'td.time_pickup', function(e) {
+		editor.bubble(this, 'time_pickup');
+	});
+
+	$(table_dom).on('click', 'td.time_depart', function(e) {
+		editor.bubble(this, 'time_depart');
+	});
 
-		if($(this).hasClass('time_pickup'))
-			editor.inline(this, 'time_pickup');
+	$(table_dom).on('click', 'td.bol_delivered', function(e) {
+		editor.bubble(this, 'bol_delivered');
+	});
+	
+	/*
+	$(table_dom).on('click', 'td.time_pickup, td.time_depart, td.bol_delivered', function(e) {
+		editor.bubble(this, [ 'time_pickup', 'time_depart', 'bol_delivered' ]);
 	});
+	*/
 	
 	return table;
 }