From: Vásáry Dániel Date: Thu, 7 Mar 2024 13:01:46 +0000 (+0100) Subject: Login row hover fix X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=a386d4474234cd364c3799dea640a704e236b2b2;p=sly-crm.git Login row hover fix --- diff --git a/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/ProjectEditorModel.java b/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/ProjectEditorModel.java index 794afae..8248b90 100644 --- a/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/ProjectEditorModel.java +++ b/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/ProjectEditorModel.java @@ -1,12 +1,27 @@ package hu.user.lis.ui.editor; import com.google.common.collect.ImmutableMap; -import hu.user.lis.db.*; +import hu.user.lis.db.Associate; +import hu.user.lis.db.IncomingInvoice; +import hu.user.lis.db.Invoice; +import hu.user.lis.db.OutgoingInvoice; +import hu.user.lis.db.Partner; +import hu.user.lis.db.Project; +import hu.user.lis.db.ProjectAssociate; +import hu.user.lis.db.Treasury; import hu.user.lis.service.data.EntityDocumentAction; import hu.user.lis.service.data.EntityDocumentService; import hu.user.lis.ui.Constants; import hu.user.lis.ui.converter.ProjectStatusConverter; -import hu.user.lis.ui.data.*; +import hu.user.lis.ui.data.AssociatesDataModel; +import hu.user.lis.ui.data.IncomeMarginsDataModel; +import hu.user.lis.ui.data.InvoiceDataModel; +import hu.user.lis.ui.data.MoneyBalance; +import hu.user.lis.ui.data.ProjectAssociatesDataModel; +import hu.user.lis.ui.data.ProjectStatusDataModel; +import hu.user.lis.ui.data.ProjectsDataModel; +import hu.user.lis.ui.data.ServiceRecordsDataModel; +import hu.user.lis.ui.data.TreasuryDataModel; import hu.user.lis.ui.editor.common.Editors; import hu.user.lis.ui.editor.common.EntityEditorModel; import hu.user.lis.ui.editor.validator.FormValidator; @@ -18,7 +33,11 @@ import lombok.extern.log4j.Log4j2; import org.apache.commons.collections4.CollectionUtils; import org.springframework.transaction.annotation.Transactional; import org.zkoss.bind.BindUtils; -import org.zkoss.bind.annotation.*; +import org.zkoss.bind.annotation.BindingParam; +import org.zkoss.bind.annotation.Command; +import org.zkoss.bind.annotation.Destroy; +import org.zkoss.bind.annotation.Init; +import org.zkoss.bind.annotation.NotifyChange; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.select.annotation.WireVariable; @@ -41,47 +60,59 @@ public class ProjectEditorModel extends EntityEditorModel { @Setter @WireVariable AssociatesDataModel associatesDataModel; + @WireVariable ProjectsDataModel projectsDataModel; + @WireVariable private InvoiceDataModel invoiceDataModel; - // @WireVariable -// private InvoiceRepository invoiceRepository; @WireVariable private TreasuryDataModel treasuryDataModel; + @Getter @Setter @WireVariable private ServiceRecordsDataModel serviceRecordsDataModel; + @Getter @Setter @WireVariable private ProjectStatusDataModel projectStatusDataModel; + @Getter @Setter @WireVariable private IncomeMarginsDataModel incomeMarginsDataModel; + @WireVariable private ProjectAssociatesDataModel projectAssociatesDataModel; + @Getter @Setter @WireVariable private ProjectStatusConverter projectStatusConverter; + private Map origAssociates; + @Getter @Setter private Map formAssociates; + @Getter @Setter private IncomingInvoice selectedIncomingInvoice; + @Getter @Setter private OutgoingInvoice selectedOutgoingInvoice; + @Getter @Setter private Treasury selectedTreasury; + @Getter private String partialAssociateName; + @WireVariable private ProjectFormValidator projectFormValidator; diff --git a/sly-crm-ui/src/main/resources/web/login.zul b/sly-crm-ui/src/main/resources/web/login.zul index 7d84377..dae35c4 100644 --- a/sly-crm-ui/src/main/resources/web/login.zul +++ b/sly-crm-ui/src/main/resources/web/login.zul @@ -15,13 +15,13 @@ display:table; margin:auto; } - .z-row:hover>.z-row-inner, - .z-row:hover>.z-cell { - background-color: white; - } - .z-grid-odd > .z-row-inner, .z-grid-odd > .z-cell { - background: none repeat scroll 0 0 white; - } + + + + + + + diff --git a/sly-crm-ui/src/main/resources/web/static/css/webclient.css b/sly-crm-ui/src/main/resources/web/static/css/webclient.css index 57e2990..c0fc137 100644 --- a/sly-crm-ui/src/main/resources/web/static/css/webclient.css +++ b/sly-crm-ui/src/main/resources/web/static/css/webclient.css @@ -526,4 +526,3 @@ input[type="checkbox"]:hover { box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75); } -