diff --git a/blocks/form/components/accordion/accordion.css b/blocks/form/components/accordion/accordion.css index 6a1c10a..ad2ee75 100644 --- a/blocks/form/components/accordion/accordion.css +++ b/blocks/form/components/accordion/accordion.css @@ -5,11 +5,25 @@ --color-accordion-border: #ecedf3; } +/* main .form fieldset.accordion legend.accordion-legend */ +main .form .accordion > fieldset { + background-color: white ; +} +/* main .form fieldset.accordion > fieldset:not(.checkbox-group-wrapper, .radio-group-wrapper) */ +main .form fieldset.accordion > fieldset + + fieldset:not(.checkbox-group-wrapper, .radio-group-wrapper) { + margin-top: 2rem; +} + +main .form .accordion legend { + background-color: transparent; +} + main .form fieldset.accordion legend.accordion-legend { padding: 24px 32px; - background-color: var(--color-accordion-legend-background); + /* background-color: var(--color-accordion-legend-background); */ position: relative; - margin-bottom: 0; + /* margin-bottom: 0; */ } main .form .accordion > fieldset > legend.accordion-legend[data-visible='false'] { diff --git a/blocks/order-status/order-status.css b/blocks/order-status/order-status.css new file mode 100644 index 0000000..e69de29 diff --git a/blocks/order-status/order-status.js b/blocks/order-status/order-status.js new file mode 100644 index 0000000..0ab61ec --- /dev/null +++ b/blocks/order-status/order-status.js @@ -0,0 +1,42 @@ +export default function decorate(block) { + let orderStatus = []; + const orderStatusApiData = ` + { + "orders": [ + { + "orderId": "ORD-1001", + "productName": "Foresight® Carrier Screen", + "orderDate": "2025-08-05", + "status": "Completed – View Results", + "trackingNumber": "TRACK12345", + "sampleReceivedDate": "2025-08-10", + "resultsAvailableDate": "2025-08-25", + "notes": "Returns complete, report available in patient portal" + }, + { + "orderId": "ORD-1002", + "productName": "Prequel® Prenatal Screen", + "orderDate": "2025-08-15", + "status": "Processing", + "trackingNumber": "TRACK67890", + "expectedSampleArrival": "2025-08-20", + "expectedResultsDate": "2025-08-29", + "notes": "Blood draw scheduled via mobile phlebotomy" + }, + { + "orderId": "ORD-1003", + "productName": "MyRisk® Hereditary Cancer Test", + "orderDate": "2025-08-20", + "status": "Pending", + "trackingNumber": null, + "expectedShipmentDate": "2025-08-22", + "notes": "Doctor needs to sign off order" + } + ] +}`; + const orderStatusJSON = JSON.parse(orderStatusApiData); + console.log(orderStatusJSON); + const orderStatusMarkup = `

Order Status

`; + block.innerHTML = ""; + block.appendChild(orderStatusMarkup); +} diff --git a/component-definition.json b/component-definition.json index 4c744fa..5c1048f 100644 --- a/component-definition.json +++ b/component-definition.json @@ -675,6 +675,41 @@ } } } +<<<<<<< HEAD + }, + { + "title": "Order Accordion", + "id": "order-accordion", + "plugins": { + "xwalk": { + "page": { + "resourceType": "core/franklin/components/block/v1/block", + "template": { + "name": "Order Accordion", + "filter": "order-accordion", + "fd:viewType": "order-accordion" + } + } + } + } + }, + { + "title": "Order Status", + "id": "order-status", + "plugins": { + "xwalk": { + "page": { + "resourceType": "core/franklin/components/block/v1/block", + "template": { + "name": "Order Status", + "filter": "order-status", + "fd:viewType": "order-status" + } + } + } + } +======= +>>>>>>> main } ] } diff --git a/component-filters.json b/component-filters.json index d580bdf..a7ae2be 100644 --- a/component-filters.json +++ b/component-filters.json @@ -17,7 +17,13 @@ "columns", "fragment", "form", +<<<<<<< HEAD + "embed-adaptive-form", + "order-accordion", + "order-status" +======= "embed-adaptive-form" +>>>>>>> main ] }, { diff --git a/component-models.json b/component-models.json index 70c64c1..db71b90 100644 --- a/component-models.json +++ b/component-models.json @@ -5165,5 +5165,62 @@ "valueType": "string" } ] + }, + { + "id": "order-accordion", + "fields": [ + { + "component": "reference", + "valueType": "string", + "name": "image", + "label": "Image", + "multi": false + }, + { + "component": "richtext", + "name": "text", + "value": "", + "label": "Text", + "valueType": "string" + } + ] + }, + { + "id": "order-accordion", + "fields": [ + { + "component": "reference", + "valueType": "string", + "name": "image", + "label": "Image", + "multi": false + }, + { + "component": "richtext", + "name": "text", + "value": "", + "label": "Text", + "valueType": "string" + } + ] + }, + { + "id": "order-status", + "fields": [ + { + "component": "reference", + "valueType": "string", + "name": "image", + "label": "Image", + "multi": false + }, + { + "component": "richtext", + "name": "text", + "value": "", + "label": "Text", + "valueType": "string" + } + ] } ] \ No newline at end of file