From 980f0444fa26afa6ca9c90c0ad22cfbd0fc5e5f6 Mon Sep 17 00:00:00 2001 From: Nur Nadiah Nabilah Binti Hashinordin Date: Wed, 9 Aug 2017 17:46:05 +0800 Subject: [PATCH] ammendment 9/8 --- Forwarder/chat.html | 40 +- Forwarder/contactlist.html | 34 +- Forwarder/deliveryarrange.html | 121 ++-- Forwarder/formcustomize.html | 39 +- Forwarder/index.html | 38 +- Forwarder/notice.html | 40 +- Forwarder/profile.html | 38 +- Forwarder/profile2.html | 38 +- Forwarder/profileedris.html | 1039 -------------------------------- Forwarder/profilelinda.html | 1039 -------------------------------- Forwarder/team.html | 37 +- Forwarder/team2.html | 37 +- Forwarder/trackorder.html | 39 +- Forwarder/trackorder2.html | 3 +- Forwarder/updatecurrency.html | 37 +- Importer/chat.html | 7 + Importer/contactlist.html | 10 +- Importer/index.html | 7 + Importer/notice.html | 7 + Importer/opendraft.html | 302 +--------- Importer/payment.html | 303 +--------- Importer/profile.html | 8 + Importer/profile2.html | 7 + Importer/purchaseorder.html | 304 +--------- Importer/shippingorder.html | 296 +-------- Importer/team.html | 7 + Importer/team2.html | 7 + Importer/trackorder.html | 7 + 28 files changed, 526 insertions(+), 3365 deletions(-) delete mode 100644 Forwarder/profileedris.html delete mode 100644 Forwarder/profilelinda.html diff --git a/Forwarder/chat.html b/Forwarder/chat.html index 83f5161..aa70d63 100644 --- a/Forwarder/chat.html +++ b/Forwarder/chat.html @@ -93,7 +93,13 @@ margin-right: -100%; } } - + .media-object-4 { + width: 35px; + position: right ; + margin-left: 82%; + margin-top:0.7%; + } + @@ -115,6 +121,8 @@ + ... +
@@ -565,40 +593,6 @@ Vehicle No: WAA 123 C - - @@ -1212,14 +1206,14 @@ Vehicle No: WAA 123 C var dataSet = [ - ["1","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00006 5","CIEF/0008","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","03-07-2017","03-07-2017
Delayed","Delivery Request Sent", "Not Completed"], - ["2","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00005 ","CIEF/0007","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","02-07-2017","02-07-2017","Delivery Request Sent", "Not Completed"], - ["3","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00004 ","CIEF/0006","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","01-07-2017","01-07-2017
Delayed","Delivery Request Sent", "Not Completed"], - ["4","03-07-2017","Vehicle No:JNY1122
Contact Person:Handsome
Contact No: 012345689"," 00003 5","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], - ["5","03-07-2017","Vehicle No:JNY1122
Contact Person:Hantam
Contact No: 012345689"," 00002 5","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], - ["6","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], - ["7","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"], - ["8","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"] + ["1","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00006 5","CIEF/0008","CTN56","Bangi
Selangor","123456","03-07-2017","03-07-2017
Delayed","Delivery Request Sent", "Not Completed"], + ["2","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00005 ","CIEF/0007","CTN56","Bangi
Selangor","123456","02-07-2017","02-07-2017","Delivery Request Sent", "Not Completed"], + ["3","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00004 ","CIEF/0006","CTN56","Bangi
Selangor","123456","01-07-2017","01-07-2017
Delayed","Delivery Request Sent", "Not Completed"], + ["4","03-07-2017","Vehicle No:JNY1122
Contact Person:Handsome
Contact No: 012345689"," 00003 5","CIEF/0005","CTN56","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], + ["5","10-07-2017","Vehicle No:JLK3333
Contact Person:Hantam
Contact No: 012345689"," 00002 5","CIEF/0004","CTN56","Bangi
Selangor","123456","29-06-2017","29-06-2017","Delivery Request Refused", "Not Completed"], + ["6","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], + ["7","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"], + ["8","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"] ]; var dataSet2 = [ @@ -1249,7 +1243,7 @@ Vehicle No: WAA 123 C 'targets': [0] }, { - "targets": [ 12 ], + "targets": [ 11 ], "visible": false }], // scroller extension: http://datatables.net/extensions/scroller/ @@ -1298,17 +1292,16 @@ Vehicle No: WAA 123 C { title: 'Order No
' }, { title: 'Customer
Code
' }, { title: 'Shipment
No
' }, - { title: 'Customer
Details
' }, - { title: 'Area
State
' }, - { title: 'Container No
' }, - { title: 'ETD
' }, - { title: 'ETA
' }, - { title: 'Status
' }, + { title: 'Area
State
' }, + { title: 'Container No
' }, + { title: 'ETD
' }, + { title: 'ETA
' }, + { title: 'Status
' }, { title: 'Stats' }, ], initComplete: function () { - configFilter(this, [1, 2,3, 4,5,6,7,8,9,10,11]); + configFilter(this, [1, 2,3, 4,5,6,7,8,9,10]); } }); @@ -1364,12 +1357,12 @@ Vehicle No: WAA 123 C configFilter(this, [ 2,3, 4,5,6,7,8]); } }); - table1.columns( 12 ).search( 'Not Completed' ).draw(); + table1.columns( 11 ).search( 'Not Completed' ).draw(); $('.asdasd').on('switchChange.bootstrapSwitch', function (event, state) { if(state == true){ - table1.columns( 12 ).search( 'Not Completed' ).draw(); + table1.columns( 11 ).search( 'Not Completed' ).draw(); }else{ - table1.columns( 12 ).search( 'Completed' ).draw(); + table1.columns( 11 ).search( 'Completed' ).draw(); } diff --git a/Forwarder/formcustomize.html b/Forwarder/formcustomize.html index 084c50e..e7cae25 100644 --- a/Forwarder/formcustomize.html +++ b/Forwarder/formcustomize.html @@ -62,6 +62,13 @@ License: You must have a valid license purchased only from themeforest(the above margin-right: -100%; } } + .media-object-4 { + width: 35px; + position: right ; + margin-left: 67%; + margin-top:0.7%; + } + @@ -93,6 +100,7 @@ License: You must have a valid license purchased only from themeforest(the above + ...