diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index affbab2..15b19f8 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/arrangements-delivery_arrangements1.1.html b/arrangements-delivery_arrangements1.1.html new file mode 100644 index 0000000..68aba69 --- /dev/null +++ b/arrangements-delivery_arrangements1.1.html @@ -0,0 +1,369 @@ + + + + + + AzureUI - VIEW SHIPMENT ARRANGEMENT1-DETAILS + + + + + + + +
+
+ +
+ +

Delivery Arrangement

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

Consolidation

+
+
+ +
+ Order Selection +
+
+ +
+ + + + +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+ +
+
+ + + + +
+ Appointment +
+
+ +
+ +
+
+ + + + + + + + + + + \ 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

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

Delivery Arrangement Status

+

Delivery Arrangement

@@ -78,379 +78,28 @@
-
- - - - Add New - + +
+ + + + Add New Delivery Arrangement + +
- -
-
- Delivery arrangement is empty, do you want to add new arrangement? -
- - -
+ +
+
+ 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 6c95bc3..977529e 100644 --- a/arrangements-delivery_arrangements2.html +++ b/arrangements-delivery_arrangements2.html @@ -65,7 +65,7 @@
-

Delivery Arrangement Status

+

Delivery Arrangement

@@ -78,12 +78,13 @@
-
- - - - Add New - +
+ + + + Add New Delivery Arrangement + +
List of Delivery Arrangement @@ -91,384 +92,29 @@
- - - - Delivery No : STEAM/12345 - Decision Request + + 12/03 + Inhouse Services + KED1726 + Decision Request
- - - - Delivery No : STEAM/1234 - Decision Request + + 12/03 + Inhouse Services + KED1726 + Decision Request
- -
-
- - - - - - diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html new file mode 100644 index 0000000..5c674da --- /dev/null +++ b/arrangements-shipment_arrangements1.1.html @@ -0,0 +1,375 @@ + + + + + + AzureUI - VIEW SHIPMENT ARRANGEMENT1- + + + + + + + +
+
+ +
+ +

Shipment Arrangement

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

Consolidation

+
+
+ +
+ Order Selection +
+
+ +
+ + + + +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+ +
+
+ + + + +
+
+ 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? +
+ + + + Add New SAS +
- - -
- -
+ +
+
+ Shipment arrangement status is empty, do you want to add new shipment arrangement status? +
+ + + - - - - 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 - + +
    +
    + + + + Add New SAS + +
    - List of Shipment Arrangement -
    - -
    - -
    - - - - Shipment No : PFG5467 - -
    -
    - - - - Shipment No : KED1726 - -
    - - -
    - - - -
    -
    -
    + List of Status + + +
    +
    + + + + Shipment No : PFG5467 + Moving Out + +
    +
    + + + + Shipment No : KED1726 + Moving Out + +
    + + + - - - - 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 @@
    -
    +
    Submit
    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 +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    + Custom Examination + Details +
    +
    +
    +
    + +
    + +
    +
    + + + + + + + + \ No newline at end of file diff --git a/arrangements-shipment_arrangements_review1.html b/arrangements-shipment_arrangements_review1.html index 3156966..198d878 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 Selection +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    + +
    Custom Examination - Details
    - + 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/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 55ef212..6888b67 100644 --- a/css/global.style.css +++ b/css/global.style.css @@ -675,6 +675,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; @@ -1386,6 +1399,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; 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

    -
    - - - -
    -
    - - - -
    -
    -
    -
    - - - - Add New - - -
    - -
    - - - - Status 1 - -
    -
    - - - - Status 2 - -
    - - -
    - - - -
    -
    -
    - -
    -
    - - - - - - - - - - - - \ 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