backoffice UI: home page link + use of fieldset

openi40 · Jan 15, 2024 · fb1735d · fb1735d
1 parent 26726fa
commit fb1735d
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 31 deletions.
diff --git a/...uling-ui/projects/openi40-backoffice-screens/src/lib/openi40-backoffice-screens.module.ts b/...uling-ui/projects/openi40-backoffice-screens/src/lib/openi40-backoffice-screens.module.ts
@@ -28,7 +28,9 @@ import { MegaMenuItem } from 'primeng/api';
 import { UI_MENU } from '@openi40/backoffice-ui';
 import { BASE_PATH } from '@openi40/backoffice-api';
 import { getBaseUrl } from "@openi40/common-ui";
-const BACKOFFICE_MENU_ITEMS: MegaMenuItem[] = [{
+const BACKOFFICE_MENU_ITEMS: MegaMenuItem[] = [
+  { label:"Home",icon:"pi pi-home",automationId:true,url:"/"}
+  ,{
   label: 'companies organization',
   icon: 'pi pi-fw pi-sitemap',
   items: [

diff --git a/...scheduling-ui/projects/openi40-backoffice-ui/src/lib/openi40-backoffice-meta-ui.module.ts b/...scheduling-ui/projects/openi40-backoffice-ui/src/lib/openi40-backoffice-meta-ui.module.ts
@@ -14,6 +14,7 @@ import { CheckboxModule } from 'primeng/checkbox';
 import { AutoCompleteModule } from 'primeng/autocomplete';
 import { BreadcrumbModule } from 'primeng/breadcrumb';
 import { MegaMenuModule } from 'primeng/megamenu';
+import { FieldsetModule } from 'primeng/fieldset';
 import { DetailUIFormComponent } from './ui-configurable/detail-ui-form/detail-ui-form.component';
 import { UIConfiguredFormComponent } from './ui-configurable/ui-configured-form/ui-configured-form.component';
 import { BlockUIModule } from 'primeng/blockui';
@@ -27,9 +28,9 @@ import { UIEntitesRelatedComponent } from './ui-configurable/ui-entities-related
 import { ContextMenuModule } from 'primeng/contextmenu';
 import { UINavigationComponent } from './ui-configurable/ui-navigation/ui-navigation.component';
 @NgModule({
-    imports: [CommonModule,  FormsModule, ReactiveFormsModule, TableModule, RouterModule, InputTextModule, DropdownModule, ButtonModule, AutoCompleteModule, CheckboxModule, CalendarModule, BlockUIModule, InputMaskModule,AccordionModule,ContextMenuModule,BreadcrumbModule,MegaMenuModule],
+    imports: [CommonModule,  FormsModule, ReactiveFormsModule, TableModule, RouterModule, InputTextModule, DropdownModule, ButtonModule, AutoCompleteModule, CheckboxModule, CalendarModule, BlockUIModule, InputMaskModule,AccordionModule,ContextMenuModule,BreadcrumbModule,MegaMenuModule,FieldsetModule],
     declarations: [UIConfigurableControlComponent, SearchUIFormComponent, DetailUIFormComponent, UIConfiguredFormComponent, UIConfigurableGridComponent,UIConfigurableEditableGridComponent,UIConfiguredFormArray,UIEntitesRelatedComponent,UINavigationComponent],
     exports: [UIConfigurableControlComponent, SearchUIFormComponent, DetailUIFormComponent, UIConfiguredFormComponent, UIConfigurableGridComponent,UIConfigurableEditableGridComponent,UIConfiguredFormArray,UIEntitesRelatedComponent,UINavigationComponent],
     providers: [FormGroupConfigurationService, DefaultGoToDetailService]
 })
-export class Openi40BackofficeMetaUIModule { }
+export class Openi40BackofficeMetaUIModule { }
diff --git a/...peni40-backoffice-ui/src/lib/ui-configurable/detail-ui-form/detail-ui-form.component.html b/...peni40-backoffice-ui/src/lib/ui-configurable/detail-ui-form/detail-ui-form.component.html
@@ -1,8 +1,10 @@
 <ui-navigation></ui-navigation>
+<h1>{{config.title}}</h1>
 <div class="content" #mainContent>
   <p-blockUI [target]="mainContent" [blocked]="loading">
     <i class="pi pi-lock" style="font-size: 3rem"></i>
   </p-blockUI>
+  <p-fieldset legend="Edit/view form">
   <ui-configured-form
     [formGroup]="frmGroup"
     [config]="config.formGroup"
@@ -22,4 +24,5 @@
       ></button>
     </div>
   </div>
+</p-fieldset>
 </div>
diff --git a/...peni40-backoffice-ui/src/lib/ui-configurable/search-ui-form/search-ui-form.component.html b/...peni40-backoffice-ui/src/lib/ui-configurable/search-ui-form/search-ui-form.component.html
@@ -1,32 +1,44 @@
 <ui-navigation></ui-navigation>
 <div class="content" [formGroup]="frmGroup" *ngIf="frmGroup" #mainContent>
-    <p-blockUI [target]="mainContent" [blocked]="loading">
-        <i class="pi pi-lock" style="font-size: 3rem"></i>
-    </p-blockUI>
-    <h1>{{config.title}}</h1>
-    <h2>Search filters</h2>
-    <div class="row">
-        <ui-configured-form [formGroup]="frmGroup" [config]="config.formGroup" [formTemplate]="formTemplate">
-
-        </ui-configured-form>
-        <div class="col-2">
-            <p-button label="Search" (onClick)="doSearch()" [disabled]="disabledSearch"></p-button>
-        </div>
+  <p-blockUI [target]="mainContent" [blocked]="loading">
+    <i class="pi pi-lock" style="font-size: 3rem"></i>
+  </p-blockUI>
+  <h1>{{ config.title }}</h1>
+
+  <p-fieldset legend="Search filters">
+
+
+  <div class="row">
+    <ui-configured-form
+      [formGroup]="frmGroup"
+      [config]="config.formGroup"
+      [formTemplate]="formTemplate"
+    >
+    </ui-configured-form>
+    <div class="col-2">
+      <p-button
+        label="Search"
+        (onClick)="doSearch()"
+        [disabled]="disabledSearch"
+      ></p-button>
     </div>
-    <div class="row">
-        <div class="col-12">
-
-            <ui-configurable-grid 
-                    [columnsConfig]="columnsConfig" 
-                    [actualPage]="actualPage" 
-                    [externalPagingManagement]="true" 
-                    [paged]="true" 
-                    [data]="results" 
-                    [gotoDetailService]="gotoDetailService" 
-                    (actualPageChange)="pageChange($event)" 
-                    [entitiesReferences]="config?.entitiesReferences">
-                </ui-configurable-grid>
-
-        </div>
+  </div>
+</p-fieldset>
+<p-fieldset legend="Search results">
+  <div class="grid">
+    <div class="col-12">
+      <ui-configurable-grid
+        [columnsConfig]="columnsConfig"
+        [actualPage]="actualPage"
+        [externalPagingManagement]="true"
+        [paged]="true"
+        [data]="results"
+        [gotoDetailService]="gotoDetailService"
+        (actualPageChange)="pageChange($event)"
+        [entitiesReferences]="config?.entitiesReferences"
+      >
+      </ui-configurable-grid>
     </div>
-</div>
+  </div>
+</p-fieldset>
+</div>