diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql index 0b621d6..44eb24f 100644 --- a/container/oracle/initdb.d/03_default_data.sql +++ b/container/oracle/initdb.d/03_default_data.sql @@ -182,4 +182,5 @@ INSERT INTO WORKMAP_OWNER.WORK_MAP_PSS_AREA (WORK_MAP_PSS_AREA_ID, AREA_NAME) VA INSERT INTO WORKMAP_OWNER.WORK_MAP_PSS_AREA (WORK_MAP_PSS_AREA_ID, AREA_NAME) VALUES (8, 'hd-pss'); INSERT INTO WORKMAP_OWNER.WORK_MAP_PSS_AREA (WORK_MAP_PSS_AREA_ID, AREA_NAME) VALUES (9, 'hdt-pss'); INSERT INTO WORKMAP_OWNER.WORK_MAP_PSS_AREA (WORK_MAP_PSS_AREA_ID, AREA_NAME) VALUES (10, 'fel-pss'); +INSERT INTO WORKMAP_OWNER.WORK_MAP_PSS_AREA (WORK_MAP_PSS_AREA_ID, AREA_NAME) VALUES (11, 'gts-pss'); diff --git a/src/main/webapp/resources/css/workmap.css b/src/main/webapp/resources/css/workmap.css index 7524a5b..9660bb4 100644 --- a/src/main/webapp/resources/css/workmap.css +++ b/src/main/webapp/resources/css/workmap.css @@ -255,6 +255,29 @@ background: url("../img/pss/LERF_yellow_dashed.png") no-repeat scroll 0 0 transparent; } +.gts-pss span { + height: 37px; + width: 103px; +} +.gts-pss .beam-permit { + background: url("../img/pss/GTS_purple_line.png") no-repeat scroll 0 0 transparent; +} +.gts-pss .power-permit { + background: url("../img/pss/GTS_red_line.png") no-repeat scroll 0 0 transparent; +} +.gts-pss .lock-beam-permit { + background: url("../img/pss/GTS_purple_dashed.png") no-repeat scroll 0 0 transparent; +} +.gts-pss .lock-power-permit { + background: url("../img/pss/GTS_red_dashed.png") no-repeat scroll 0 0 transparent; +} +.gts-pss .controlled-access { + background: url("../img/pss/GTS_yellow_line.png") no-repeat scroll 0 0 transparent; +} +.gts-pss .lock-controlled-access { + background: url("../img/pss/GTS_yellow_dashed.png") no-repeat scroll 0 0 transparent; +} + /* Task Areas */ .inj1 { left: 90px; @@ -962,10 +985,41 @@ z-index: 85; } .fel4 { - left: 796px; + left: 860px; top: 564px; z-index: 85; } +.testlab1 { + left: 135px; + top: 10px; + z-index: 100; +} +.testlab2 { + left: 135px; + top: 50px; + z-index: 100; +} +.testlab3 { + left: 135px; + top: 90px; + z-index: 100; +} +.testlab4 { + left: 135px; + top: 130px; + z-index: 100; +} +.testlab5 { + left: 173px; + top: 170px; + z-index: 100; +} +.testlab6 { + left: 173px; + top: 210px; + z-index: 100; +} + /* PSS Areas */ .nl-pss { left: 234px; @@ -1007,6 +1061,10 @@ left: 800px; top: 525px; } +.gts-pss { + left: 810px; + top: 565px; +} .editable-nl-pss { left: 610px; top: 235px; @@ -1044,38 +1102,12 @@ top: 785px; } .editable-fel-pss { - left: 800px; + left: 750px; top: 539px; } -.testlab1 { - left: 135px; - top: 10px; - z-index: 100; -} -.testlab2 { - left: 135px; - top: 50px; - z-index: 100; -} -.testlab3 { - left: 135px; - top: 90px; - z-index: 100; -} -.testlab4 { - left: 135px; - top: 130px; - z-index: 100; -} -.testlab5 { - left: 173px; - top: 170px; - z-index: 100; -} -.testlab6 { - left: 173px; - top: 210px; - z-index: 100; +.editable-gts-pss { + left: 750px; + top: 569px; } /* Map Layout */ .area { diff --git a/src/main/webapp/resources/img/accelerator.png b/src/main/webapp/resources/img/accelerator.png index c15f117..c52df15 100644 Binary files a/src/main/webapp/resources/img/accelerator.png and b/src/main/webapp/resources/img/accelerator.png differ diff --git a/src/main/webapp/resources/img/pss/GTS_purple_dashed.png b/src/main/webapp/resources/img/pss/GTS_purple_dashed.png new file mode 100644 index 0000000..4584468 Binary files /dev/null and b/src/main/webapp/resources/img/pss/GTS_purple_dashed.png differ diff --git a/src/main/webapp/resources/img/pss/GTS_purple_line.png b/src/main/webapp/resources/img/pss/GTS_purple_line.png new file mode 100644 index 0000000..58f4fd9 Binary files /dev/null and b/src/main/webapp/resources/img/pss/GTS_purple_line.png differ diff --git a/src/main/webapp/resources/img/pss/GTS_red_dashed.png b/src/main/webapp/resources/img/pss/GTS_red_dashed.png new file mode 100644 index 0000000..be4c16d Binary files /dev/null and b/src/main/webapp/resources/img/pss/GTS_red_dashed.png differ diff --git a/src/main/webapp/resources/img/pss/GTS_red_line.png b/src/main/webapp/resources/img/pss/GTS_red_line.png new file mode 100644 index 0000000..c17f21c Binary files /dev/null and b/src/main/webapp/resources/img/pss/GTS_red_line.png differ diff --git a/src/main/webapp/resources/img/pss/GTS_yellow_dashed.png b/src/main/webapp/resources/img/pss/GTS_yellow_dashed.png new file mode 100644 index 0000000..9fbfc66 Binary files /dev/null and b/src/main/webapp/resources/img/pss/GTS_yellow_dashed.png differ diff --git a/src/main/webapp/resources/img/pss/GTS_yellow_line.png b/src/main/webapp/resources/img/pss/GTS_yellow_line.png new file mode 100644 index 0000000..c243792 Binary files /dev/null and b/src/main/webapp/resources/img/pss/GTS_yellow_line.png differ