diff --git a/public/assets/css/default.css b/public/assets/css/default.css index 86dd4364..c1ccf469 100644 --- a/public/assets/css/default.css +++ b/public/assets/css/default.css @@ -128,3 +128,14 @@ text-align: center; margin-top: 1rem; } +.infra-activity-table-header { + border-top: 0; + text-transform: capitalize !important; +} + +.infra-activity-table-header-first { + border-top: 0; + text-transform: capitalize !important; + text-align: left; + padding-left: 60px; +} diff --git a/src/components/Project/Infrastructure/Building.jsx b/src/components/Project/Infrastructure/Building.jsx index 4f059964..62b8f533 100644 --- a/src/components/Project/Infrastructure/Building.jsx +++ b/src/components/Project/Infrastructure/Building.jsx @@ -1,31 +1,38 @@ import React from "react"; -const Building = ( {building, toggleBuilding, expandedBuildings, getContent} ) => -{ +const Building = ({ + building, + toggleBuilding, + expandedBuildings, + getContent, +}) => { + return ( + + + toggleBuilding(building.id)} + > +
+
+ {building.name}   + {expandedBuildings.includes(building.id) ? ( + + ) : ( + + )} +
+
+ + - return ( - - - toggleBuilding(building.id)} - > -
-
- {building.name}   - {expandedBuildings.includes(building.id) ? ( - - ) : ( - - )} -
-
- - - - {expandedBuildings.includes(building.id) && getContent(building)} -
- ); - }; - export default Building \ No newline at end of file + {expandedBuildings.includes(building.id) && getContent(building)} +
+ ); +}; +export default Building; diff --git a/src/components/Project/Infrastructure/Floor.jsx b/src/components/Project/Infrastructure/Floor.jsx index 82e7f95c..f12ca1ab 100644 --- a/src/components/Project/Infrastructure/Floor.jsx +++ b/src/components/Project/Infrastructure/Floor.jsx @@ -1,29 +1,31 @@ import React from "react"; import WorkArea from "./WorkArea"; -const Floor = ( {floor, workAreas,forBuilding} ) => -{ - - return ( - - {workAreas && workAreas.length > 0 ? ( - workAreas.map((workArea) => ( - - )) - ) : ( - - -
-
-
- {floor.floorName}   -
-
+const Floor = ({ floor, workAreas, forBuilding }) => { + return ( + + {workAreas && workAreas.length > 0 ? ( + workAreas.map((workArea) => ( + + )) + ) : ( + + +
+
+
+ {floor.floorName}   +
- - - )} - - - ); - }; - export default Floor \ No newline at end of file +
+ + + )} +
+ ); +}; +export default Floor; diff --git a/src/components/Project/Infrastructure/InfraTable.jsx b/src/components/Project/Infrastructure/InfraTable.jsx index 969e01fc..9f7bf085 100644 --- a/src/components/Project/Infrastructure/InfraTable.jsx +++ b/src/components/Project/Infrastructure/InfraTable.jsx @@ -73,7 +73,6 @@ const InfraTable = ({ buildings }) => { } }; - const handleClearComplete = () => { setClearTrigger(false); }; @@ -91,8 +90,11 @@ const InfraTable = ({ buildings }) => { ) : ( -
-

No floors have been added yet. Please add floors to start managing your building.

+
+

+ No floors have been added yet. Start by adding floors to manage + this building. +