From a175668ab7db3080d54b3b1f32a5ba1502d30b86 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Tue, 27 Mar 2018 12:11:13 +0800 Subject: [PATCH 1/4] remove shipment arrangement details, when click one of the list in shipment arrangement straight go to details. --- arrangements-shipment_arrangements1.1.html | 300 ++++++++++++++++++++ arrangements-shipment_arrangements1.html | 306 +-------------------- css/global.style.css | 13 + 3 files changed, 328 insertions(+), 291 deletions(-) create mode 100644 arrangements-shipment_arrangements1.1.html diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html new file mode 100644 index 0000000..aea3000 --- /dev/null +++ b/arrangements-shipment_arrangements1.1.html @@ -0,0 +1,300 @@ + + + + + + AzureUI - VIEW SHIPMENT ARRANGEMENT1- + + + + + + + +
+
+ +
+ +

Shipment Arrangement

+
+ + +
+
+
+
+
+ Shipment Arrangement Details +
+
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+ Loading Vehicle and Driver +
+ +
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ Loading Venue +
+ +
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ + +
+

Consolidation

+
+
+
+ Order Select +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+
+
+
+ + +
+
+ Submit +
+
+
+
+
+ +
+
+ + + + + + + + + + \ No newline at end of file diff --git a/arrangements-shipment_arrangements1.html b/arrangements-shipment_arrangements1.html index 063bdbf..a1e005c 100644 --- a/arrangements-shipment_arrangements1.html +++ b/arrangements-shipment_arrangements1.html @@ -75,303 +75,27 @@
-
-
-
- - - - Add New - - - +
-
- Shipment arrangement status is empty, do you want to add new status? + - - -
- -
+ +
+
+ Shipment arrangement status is empty, do you want to add new shipment arrangement status? +
+ + + - - - - diff --git a/css/global.style.css b/css/global.style.css index ef836ef..4b808ce 100644 --- a/css/global.style.css +++ b/css/global.style.css @@ -654,6 +654,19 @@ header .go-back-link-indexB{ color: #CCC; } +.subheader{ + font-size: 16px; + left: 50px; + right: 50px; + top: 10px; + margin: 0; + padding: 0; + height: 30px; + line-height: 30px; + text-align: center; + letter-spacing: 2px; +} + header .page-title{ font-size: 16px; position: absolute; From 3312e45f37d1e448e1fdc3eb8e2830b3b67889d1 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Tue, 27 Mar 2018 14:58:48 +0800 Subject: [PATCH 2/4] remove custom declaration, add consolidation list --- arrangements-shipment_arrangements1.1.html | 53 ++- arrangements-shipment_arrangements2.html | 344 ++------------ ...s-shipment_arrangements_review-custom.html | 2 +- ...ments-shipment_arrangements_review1.1.html | 116 +++++ ...gements-shipment_arrangements_review1.html | 261 ++++++++-- ...gements-shipment_arrangements_review2.html | 198 -------- custom_declaration.html | 205 -------- custom_declaration1.html | 221 --------- custom_declaration_review1.html | 88 ---- custom_declaration_review2.html | 447 ------------------ 10 files changed, 428 insertions(+), 1507 deletions(-) create mode 100644 arrangements-shipment_arrangements_review1.1.html delete mode 100644 arrangements-shipment_arrangements_review2.html delete mode 100644 custom_declaration.html delete mode 100644 custom_declaration1.html delete mode 100644 custom_declaration_review1.html delete mode 100644 custom_declaration_review2.html diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html index aea3000..d9c5e93 100644 --- a/arrangements-shipment_arrangements1.1.html +++ b/arrangements-shipment_arrangements1.1.html @@ -34,7 +34,7 @@
- +
@@ -114,7 +114,7 @@
- +
@@ -152,7 +152,7 @@
- +
@@ -207,6 +207,7 @@
+

Consolidation

@@ -229,7 +230,7 @@
- +
@@ -249,13 +250,53 @@
- +
- +
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+
diff --git a/arrangements-shipment_arrangements2.html b/arrangements-shipment_arrangements2.html index f2bd421..fab18f7 100644 --- a/arrangements-shipment_arrangements2.html +++ b/arrangements-shipment_arrangements2.html @@ -3,7 +3,7 @@ - AzureUI - SHIPMENT ARRANGEMENTS2 + AzureUI - SHIPMENT ARRANGEMENTS1 @@ -46,7 +46,7 @@ Custom Declaration
  • - Messenger + Messenger
  • Track Order @@ -75,320 +75,44 @@
    -
    -
    -
    - - - - Add New - + +
    +
    - List of Shipment Arrangement -
    - -
    - - - - - -
    - - - -
    -
    -
    + List of Status +
  • + +
    + + + + + - - - - diff --git a/arrangements-shipment_arrangements_review-custom.html b/arrangements-shipment_arrangements_review-custom.html index 1492ff5..fd1a264 100644 --- a/arrangements-shipment_arrangements_review-custom.html +++ b/arrangements-shipment_arrangements_review-custom.html @@ -85,7 +85,7 @@
    -
    +
    diff --git a/arrangements-shipment_arrangements_review1.1.html b/arrangements-shipment_arrangements_review1.1.html new file mode 100644 index 0000000..3156966 --- /dev/null +++ b/arrangements-shipment_arrangements_review1.1.html @@ -0,0 +1,116 @@ + + + + + + AzureUI - VIEW SHIPMENT ARRANGEMENT1- + + + + + + + +
    +
    + +
    + +

    Shipment Arrangement

    +
    + + +
    +
    +
    +
    +
    + Shipment Arrangement Status +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    +
    + +
    + +
    +
    + + + + + + + + \ No newline at end of file diff --git a/arrangements-shipment_arrangements_review1.html b/arrangements-shipment_arrangements_review1.html index 3156966..c6807e1 100644 --- a/arrangements-shipment_arrangements_review1.html +++ b/arrangements-shipment_arrangements_review1.html @@ -3,7 +3,7 @@ - AzureUI - VIEW SHIPMENT ARRANGEMENT1- + AzureUI - VIEW SHIPMENT ARRANGEMENT2-DETAILS @@ -25,45 +25,46 @@
    - Shipment Arrangement Status + Shipment Arrangement Details
    -
    +
    - +
    - -
    -
    + +
    + +
    - + +
    +
    + +
    + +
    +
    -
    - +
    +
    - +
    -
    - -
    - -
    - -
    @@ -75,37 +76,235 @@
    -
    - -
    +
    +
    + + + +
    +
    + Vehicle and Driver +
    +
    +
    +
    - +
    - +
    -
    +
    - +
    - -
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    - - + + + +
    +
    + Loading Venue +
    +
    +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    +

    Consolidation

    +
    +
    +
    + Order Select +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    + +
    - + diff --git a/arrangements-shipment_arrangements_review2.html b/arrangements-shipment_arrangements_review2.html deleted file mode 100644 index 9bda3da..0000000 --- a/arrangements-shipment_arrangements_review2.html +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - AzureUI - VIEW SHIPMENT ARRANGEMENT2-DETAILS - - - - - - - -
    -
    - -
    - -

    Shipment Arrangement

    -
    - - -
    -
    -
    -
    -
    - Shipment Arrangement Details -
    -
    -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - - - -
    -
    - Vehicle and Driver -
    -
    -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - - - -
    -
    - Loading Venue -
    -
    -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/custom_declaration.html b/custom_declaration.html deleted file mode 100644 index b03d4af..0000000 --- a/custom_declaration.html +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - AzureUI - CUSTOM DECLARATION - - - - - - - - - -
    -
    - -
    - -

    Custom Declaration Arrangement Status

    - -
    - - - -
    -
    -
    -
    - - - - Add New - - - -
    - - - -
    -
    -
    - -
    -
    - - - - - - - - - - - - \ No newline at end of file diff --git a/custom_declaration1.html b/custom_declaration1.html deleted file mode 100644 index 0375236..0000000 --- a/custom_declaration1.html +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - AzureUI - CUSTOM DECLARATION - - - - - - - - - -
    -
    - -
    - -

    Custom Declaration Arrangement Status

    - -
    - - - -
    -
    -
    - -
    -
    - -
    -
    - - - - - - - - - - - - \ No newline at end of file diff --git a/custom_declaration_review1.html b/custom_declaration_review1.html deleted file mode 100644 index 09a7b90..0000000 --- a/custom_declaration_review1.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - AzureUI - VIEW CUSTOM DECLARATION-DETAILS1 - - - - - - - -
    -
    - -
    - -

    Custom Declaration

    -
    - - -
    -
    -
    -
    -
    - Custom Declaration Arrangement Status -
    -
    -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    -
    - Details -
    -
    -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/custom_declaration_review2.html b/custom_declaration_review2.html deleted file mode 100644 index 4ae371c..0000000 --- a/custom_declaration_review2.html +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - AzureUI - VIEW CUSTOM DECLARATION-DETAILS2 - - - - - - - -
    -
    - -
    - -

    Order Details

    -
    - - -
    -
    -
    -
    - Order : 00003 -
    -
    - -
    - - -
    - -
    -
    -
    - -
    - Order Details -
    - -
    - -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - - -
    -
    - Warehouse Details -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    - -
    - - -
    -
    - Delivery Details -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    - -
    - - -
    -
    - Packaging List -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - - - -
    -
    -
    - -
    - - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    - Warehouse Arrangements -
    - -
    - -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - - -
    -
    - Shipment Arrangement -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    - -
    - - -
    -
    - Delivery Arrangement -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    - -
    - -
    -
    -
    - -
    -
    - -
    -
    - - - - - - - - - \ No newline at end of file From eac6b07c3df6ace018e793ec7ef8f7ad32db9364 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Tue, 27 Mar 2018 16:45:58 +0800 Subject: [PATCH 3/4] add vehicle, date info on delivery status --- arrangements-delivery_arrangements1.1.html | 368 +++++++++++++++++++ arrangements-delivery_arrangements1.2.html | 109 ++++++ arrangements-delivery_arrangements1.html | 382 +------------------- arrangements-delivery_arrangements2.html | 388 +-------------------- arrangements-shipment_arrangements1.1.html | 2 +- css/global.style.css | 36 ++ 6 files changed, 547 insertions(+), 738 deletions(-) create mode 100644 arrangements-delivery_arrangements1.1.html create mode 100644 arrangements-delivery_arrangements1.2.html diff --git a/arrangements-delivery_arrangements1.1.html b/arrangements-delivery_arrangements1.1.html new file mode 100644 index 0000000..559f430 --- /dev/null +++ b/arrangements-delivery_arrangements1.1.html @@ -0,0 +1,368 @@ + + + + + + AzureUI - VIEW SHIPMENT ARRANGEMENT1-DETAILS + + + + + + + +
    +
    + +
    + +

    Delivery Arrangement

    +
    + + +
    +
    +
    +
    +
    + Delivery Arrangement Details +
    +
    +
    +
    +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +

    Consolidation

    +
    +
    + +
    + Order Selection +
    +
    + +
    + + + + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + + +
    +
    + +
    +
    + + + + + +
    + +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/arrangements-delivery_arrangements1.2.html b/arrangements-delivery_arrangements1.2.html new file mode 100644 index 0000000..ead365a --- /dev/null +++ b/arrangements-delivery_arrangements1.2.html @@ -0,0 +1,109 @@ + + + + + + AzureUI - DELIVERY ARRANGEMENTS1 + + + + + + + + + +
    +
    + +
    + +

    Delivery Arrangement Status

    + +
    + + + +
    +
    +
    + + + + + + + + +
    +
    +
    + +
    +
    + + + + + + + + + \ No newline at end of file diff --git a/arrangements-delivery_arrangements1.html b/arrangements-delivery_arrangements1.html index e4af3b3..f51f41b 100644 --- a/arrangements-delivery_arrangements1.html +++ b/arrangements-delivery_arrangements1.html @@ -65,7 +65,7 @@
    -

    Delivery Arrangement Status

    +

    Delivery Arrangement

    - - - - - - diff --git a/arrangements-delivery_arrangements2.html b/arrangements-delivery_arrangements2.html index 6c95bc3..2b8dbbf 100644 --- a/arrangements-delivery_arrangements2.html +++ b/arrangements-delivery_arrangements2.html @@ -65,7 +65,7 @@
    -

    Delivery Arrangement Status

    +

    Delivery Arrangement

    - - - - - - diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html index d9c5e93..3027be4 100644 --- a/arrangements-shipment_arrangements1.1.html +++ b/arrangements-shipment_arrangements1.1.html @@ -208,7 +208,7 @@ -
    +

    Consolidation

    diff --git a/css/global.style.css b/css/global.style.css index 7d21bc3..830d5bd 100644 --- a/css/global.style.css +++ b/css/global.style.css @@ -1372,6 +1372,42 @@ select.form-element{ font-size: 12px; color: rgb(0, 153, 20); } +.list-box-emp .list-item .list-item-title-edit1{ + font-weight: 700; + display: inline-block; + line-height: 28px; + position: relative; + left: 0px; + font-size: 13px; + color: #069; +} +.list-box-emp .list-item .list-item-title-edit2{ + font-weight: 700; + display: inline-block; + line-height: 28px; + position: relative; + left: 10px; + font-size: 13px; + color: #069); +} +.list-box-emp .list-item .list-item-title-edit3{ + font-weight: 700; + display: inline-block; + line-height: 28px; + position: relative; + left: 20px; + font-size: 13px; + color: #069; +} +.list-box-emp .list-item .list-item-title-edit4{ + font-weight: 700; + display: inline-block; + line-height: 28px; + position: relative; + left: 30px; + font-size: 13px; + color: rgb(0, 153, 20); +} .list-box-emp .list-item .seperate{ display: block; float: left; From f78b10c4094eebc30ab337f7b65729b88f08de97 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Wed, 28 Mar 2018 10:39:19 +0800 Subject: [PATCH 4/4] add checkbox on consolidation and shipment --- arrangements-delivery_arrangements1.1.html | 3 +- arrangements-delivery_arrangements1.html | 7 +- arrangements-delivery_arrangements2.html | 6 +- arrangements-shipment_arrangements1.1.html | 182 +++++++++++------- ...gements-shipment_arrangements_review1.html | 4 +- ...ements-warehouse_receive_note_review4.html | 2 - css/global.style.css | 2 +- 7 files changed, 119 insertions(+), 87 deletions(-) diff --git a/arrangements-delivery_arrangements1.1.html b/arrangements-delivery_arrangements1.1.html index 559f430..68aba69 100644 --- a/arrangements-delivery_arrangements1.1.html +++ b/arrangements-delivery_arrangements1.1.html @@ -219,12 +219,12 @@
    -
    @@ -270,6 +270,7 @@
    diff --git a/arrangements-delivery_arrangements1.html b/arrangements-delivery_arrangements1.html index f51f41b..0f4a2d6 100644 --- a/arrangements-delivery_arrangements1.html +++ b/arrangements-delivery_arrangements1.html @@ -88,9 +88,10 @@
    - - - +
    +
    + Delivery arrangement status is empty, do you want to add new delivery arrangement? +
    diff --git a/arrangements-delivery_arrangements2.html b/arrangements-delivery_arrangements2.html index 2b8dbbf..977529e 100644 --- a/arrangements-delivery_arrangements2.html +++ b/arrangements-delivery_arrangements2.html @@ -92,8 +92,7 @@
    - - + 12/03 Inhouse Services KED1726 diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html index 3027be4..5c674da 100644 --- a/arrangements-shipment_arrangements1.1.html +++ b/arrangements-shipment_arrangements1.1.html @@ -207,96 +207,130 @@
    - +

    Consolidation

    +
    - Order Select + Order Selection
    -
    -
    - -
    -
    + +
    + + +
    +
    -
    -
    - +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - +
    - -
    -
    -
    - + + +
    +
    +
    + + +
    diff --git a/arrangements-shipment_arrangements_review1.html b/arrangements-shipment_arrangements_review1.html index c6807e1..198d878 100644 --- a/arrangements-shipment_arrangements_review1.html +++ b/arrangements-shipment_arrangements_review1.html @@ -188,7 +188,7 @@
    - Order Select + Order Selection
    @@ -205,7 +205,7 @@
    - +
    diff --git a/arrangements-warehouse_receive_note_review4.html b/arrangements-warehouse_receive_note_review4.html index 69bf5d9..a0f6328 100644 --- a/arrangements-warehouse_receive_note_review4.html +++ b/arrangements-warehouse_receive_note_review4.html @@ -106,8 +106,6 @@
    - -
    diff --git a/css/global.style.css b/css/global.style.css index 830d5bd..efb916d 100644 --- a/css/global.style.css +++ b/css/global.style.css @@ -1388,7 +1388,7 @@ select.form-element{ position: relative; left: 10px; font-size: 13px; - color: #069); + color: #069; } .list-box-emp .list-item .list-item-title-edit3{ font-weight: 700;