Se agrego diseño a todal las paginas con los colores oficiales y logotipos y tambien se agrego la nueva vista del Plan Anual

src/main/java/mx/gob/jumapacelaya/ui/ActDiariaView.java

@@ -2,6 +2,7 @@ package mx.gob.jumapacelaya.ui;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.html.H3;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.data.renderer.ComponentRenderer;
@@ -18,7 +19,7 @@ import java.util.*;
 
 
 @PermitAll
-@PageTitle("Home")
+@PageTitle("Actividades Diarias")
 @Route(value = "actdiaria", layout = MainLayout.class)
 public class ActDiariaView extends VerticalLayout {
 
@@ -27,7 +28,7 @@ public class ActDiariaView extends VerticalLayout {
 
     HorizontalLayout header = new HorizontalLayout();
 
-    H2 titulo = new H2();
+    H3 titulo = new H3();
 
     Grid<ActividadDiaria> grdColumnas = new Grid<>(ActividadDiaria.class,false);
 
@@ -38,10 +39,15 @@ public class ActDiariaView extends VerticalLayout {
             //new ActividadDiaria("Johannes Kepler", 1571));
 
     public ActDiariaView() {
-
-        titulo.setText("Listado de Actividades");
+        VerticalLayout headerLayout = new VerticalLayout();
+        headerLayout.getStyle().set("background-color", "#3e8bea");
+        headerLayout.add(titulo);
+        titulo.setText("Listado de Actividades Diarias");
         header.setAlignSelf(Alignment.CENTER, titulo);
 
+
+        VerticalLayout gridLayout = new VerticalLayout();
+        gridLayout.add(grdColumnas);
         //Tabla echa con un grid
         grdColumnas.addColumn(ActividadDiaria::getNumero).setHeader("Numero");
         grdColumnas.addColumn(ActividadDiaria::getProyecto).setHeader("Proyecto");
@@ -55,16 +61,13 @@ public class ActDiariaView extends VerticalLayout {
             return formato.format(date.getFechaCierre());
         }).setHeader("Fecha de cierre");
         Button btnCorrectivo = new Button("Correctivo");
-
-
-
-  
-
-
         grdColumnas.setItems(people);
 
 
-        add(titulo, header, grdColumnas);
-    }
 
+        this.setPadding(false);
+        this.setMargin(false);
+        this.setSpacing(false);
+        add(headerLayout, gridLayout);
+    }
 }

src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java

@@ -23,6 +23,7 @@ public class MainLayout extends AppLayout {
 
     public MainLayout(SecurityService securityService) {
         this.securityService = securityService;
+        this.getStyle().set("background-image", "url('images/bckgnd.png')");
         setPrimarySection(Section.DRAWER);
         addDrawerContent();
         addHeaderContent();
@@ -31,6 +32,8 @@ public class MainLayout extends AppLayout {
     private void addHeaderContent() {
         DrawerToggle toggle = new DrawerToggle();
         toggle.setAriaLabel("Menu toggle");
+        toggle.getStyle().set("border-radius", "50px");
+        toggle.getStyle().set("back-color", "red");
 
         viewTitle = new H2();
         viewTitle.addClassNames(LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE);
@@ -43,18 +46,18 @@ public class MainLayout extends AppLayout {
             securityService.logout();
         });
         logoutButton.getStyle().set("margin-right", "50px");
-        logoutButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
+        logoutButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY ,ButtonVariant.LUMO_ERROR);
 
         HorizontalLayout headerContent = new HorizontalLayout();
         headerContent.setDefaultVerticalComponentAlignment(FlexComponent.Alignment.CENTER);
         headerContent.setWidthFull();
+        headerContent.setHeight("64px");
+        headerContent.getStyle().set("background-color", "#AA86E0");
         headerContent.add(viewTitle);
         headerContent.setFlexGrow(1, viewTitle);
         headerContent.add(usrNameLabel, logoutButton);
 
         addToNavbar(false, toggle, headerContent);
-
-
     }
 
     private void addDrawerContent() {
@@ -64,7 +67,7 @@ public class MainLayout extends AppLayout {
         headerLayout.setAlignItems(FlexComponent.Alignment.CENTER);
 
         Image imgLogo = new Image("images/1027x160.png", "Logo");
-        imgLogo.setWidth("300px");
+        imgLogo.setWidth("250px");
 
         headerLayout.add(imgLogo);
 
@@ -76,8 +79,9 @@ public class MainLayout extends AppLayout {
     private SideNav createNavigation() {
         SideNav nav = new SideNav();
 
-        nav.addItem(new SideNavItem("Mantenimiento", MantenimientoView.class, VaadinIcon.COGS.create()));
-        nav.addItem(new SideNavItem("Actividad Diaria", ActDiariaView.class, VaadinIcon.ALARM.create()));
+        nav.addItem(new SideNavItem("Mantenimiento", MantenimientoView.class, VaadinIcon.WRENCH.create()));
+        nav.addItem(new SideNavItem("Plan Anual", PlanAnualView.class, VaadinIcon.CALENDAR.create()));
+        nav.addItem(new SideNavItem("Listado de Actividades", ActDiariaView.class, VaadinIcon.EDIT.create()));
         return nav;
     }
 

src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java

@@ -0,0 +1,55 @@
+package mx.gob.jumapacelaya.ui;
+
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.html.*;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import jakarta.annotation.security.PermitAll;
+import mx.gob.jumapacelaya.models.ActividadDiaria;
+
+@PermitAll
+@PageTitle("Plan Anual de Mantenimiento")
+@Route(value = "plananual", layout = MainLayout.class)
+public class PlanAnualView extends VerticalLayout {
+
+    HorizontalLayout header = new HorizontalLayout();
+    H3 titulo = new H3();
+
+    public PlanAnualView() {
+        VerticalLayout headerLayout = new VerticalLayout();
+        headerLayout.getStyle().set("background-color", "#3e8bea");
+        headerLayout.add(titulo);
+        titulo.setText("Plan Anual de Mantenimiento Preventivo de Equipo de Computo 2024");
+        header.setAlignSelf(Alignment.CENTER, titulo);
+
+        HorizontalLayout nomenclaturaLayout = new HorizontalLayout();
+        Image celayaLogo = new Image("images/logocelaya2124.png", "celaya2024");
+        celayaLogo.setWidth("100px");
+        celayaLogo.getStyle().set("margin-left", "15px");
+        celayaLogo.getStyle().set("margin-top", "15px");
+
+        TextField nomenclaturaTxt = new TextField();
+        nomenclaturaTxt.setValue("FR01-PA-7.1.3-02");
+        nomenclaturaTxt.setReadOnly(true);
+        nomenclaturaTxt.getStyle().set("margin-right", "15px");
+        nomenclaturaTxt.getStyle().set("margin-top", "15px");
+
+
+        nomenclaturaLayout.add(celayaLogo);
+        nomenclaturaLayout.addAndExpand(new HorizontalLayout());
+        nomenclaturaLayout.add(nomenclaturaTxt);
+
+
+
+
+        this.setPadding(false);
+        this.setMargin(false);
+        this.setSpacing(false);
+        add(headerLayout, nomenclaturaLayout);
+
+    }
+}