diff --git a/registration/registration-client/src/main/java/io/mosip/registration/controller/BaseController.java b/registration/registration-client/src/main/java/io/mosip/registration/controller/BaseController.java index 9c8ce209f5c..9bf02ce43eb 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/controller/BaseController.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/controller/BaseController.java @@ -201,7 +201,7 @@ public class BaseController { @Autowired private DocumentScanController documentScanController; - + protected ApplicationContext applicationContext = ApplicationContext.getInstance(); public Text getScanningMsg() { @@ -600,7 +600,7 @@ public void goToHomePage() { generateAlert(RegistrationConstants.ERROR, RegistrationUIConstants.getMessageLanguageSpecific(RegistrationUIConstants.UNABLE_LOAD_HOME_PAGE)); } } - + /** * Opens the home page screen. */ @@ -1043,7 +1043,7 @@ public void handle(WorkerStateEvent workerStateEvent) { protected void getCurrentPage(Pane pageId, String notTosShow, String show) { LOGGER.info("Pane : {}, Navigating from current page {} to show : {}", pageId == null ? "null" : pageId.getId(), notTosShow, show); - + if (pageId != null) { if (notTosShow != null) { ((Pane) pageId.lookup(RegistrationConstants.HASH + notTosShow)).setVisible(false); @@ -1052,7 +1052,7 @@ protected void getCurrentPage(Pane pageId, String notTosShow, String show) { ((Pane) pageId.lookup(RegistrationConstants.HASH + show)).setVisible(true); } } - + LOGGER.info("Navigated to next page >> {}", show); } @@ -1335,7 +1335,7 @@ protected List getContainsAllElements(List source, List } protected void updateByAttempt(double qualityScore, Image streamImage, double thresholdScore, - ImageView streamImagePane, Label qualityText, ProgressBar progressBar, Label progressQualityScore) { + ImageView streamImagePane, Label qualityText, ProgressBar progressBar) { String qualityScoreLabelVal = getQualityScoreText(qualityScore); @@ -1349,9 +1349,6 @@ protected void updateByAttempt(double qualityScore, Image streamImage, double th // Progress Bar progressBar.setProgress(qualityScore / 100); - // Progress Bar Quality Score - progressQualityScore.setText(qualityScoreLabelVal); - if (qualityScore >= thresholdScore) { progressBar.getStyleClass().removeAll(RegistrationConstants.PROGRESS_BAR_RED); progressBar.getStyleClass().add(RegistrationConstants.PROGRESS_BAR_GREEN); @@ -1491,7 +1488,7 @@ protected List getConfiguredLanguages() { } return languages; } - + protected List getConfiguredLanguagesForLogin() { List languages = new ArrayList<>(); for (String langCode : getConfiguredLangCodes()) { @@ -1522,8 +1519,8 @@ protected List getConfiguredLangCodes() { } return Collections.EMPTY_LIST; } - - + + public void setImage(ImageView imageView, String imageName) { if (imageView != null) { @@ -1548,13 +1545,13 @@ public Image getImage(String imageName, boolean canDefault) throws RegBaseChecke } - try { + try { return getImage(getImageFilePath(getConfiguredFolder(),imageName)); } catch (RegBaseCheckedException exception) { if(canDefault) { - return getImage(getImageFilePath(RegistrationConstants.IMAGES,imageName)); + return getImage(getImageFilePath(RegistrationConstants.IMAGES,imageName)); } else { throw exception; } @@ -1564,7 +1561,7 @@ public Image getImage(String imageName, boolean canDefault) throws RegBaseChecke } private Image getImage(String uri) throws RegBaseCheckedException { - try { + try { return new Image(getClass().getResourceAsStream(uri)); } catch (Exception exception) { LOGGER.error("Exception while Getting Image "+ uri, exception); @@ -1580,14 +1577,14 @@ public String getImageFilePath(String configFolder,String imageName) { String[] names = imageName.split("\\/|\\\\"); return String.format(TEMPLATE, configFolder, String.join("/", names)); } - + public String getImagePath(String imageName, boolean canDefault) throws RegBaseCheckedException { if (imageName == null || imageName.isEmpty()) { throw new RegBaseCheckedException(); } return getImageFilePath(getConfiguredFolder(),imageName); } - + public void changeNodeOrientation(Node node) { if (node != null && applicationContext.isPrimaryLanguageRightToLeft()) { node.setNodeOrientation(NodeOrientation.RIGHT_TO_LEFT); @@ -1607,7 +1604,7 @@ public Image getImage(BufferedImage bufferedImage) { } return wr; } - + /** * This method will remove the auth method from list * @@ -1623,11 +1620,11 @@ protected void removeAuthModes(List authList, String flag, String authCo authList.removeIf(auth -> authList.size() > 1 && RegistrationConstants.DISABLE.equalsIgnoreCase(flag) && auth.equalsIgnoreCase(authCode)); } - + protected boolean haveToSaveAuthToken(String userId) { return SessionContext.userId().equals(userId); } - + /** * to capture and validate the fingerprint for authentication * @@ -1649,7 +1646,7 @@ protected boolean captureAndValidateFP(String userId, boolean isPacketAuth, bool .getIntValueFromApplicationMap(RegistrationConstants.CAPTURE_TIME_OUT), 1, io.mosip.registration.context.ApplicationContext.getIntValueFromApplicationMap( RegistrationConstants.FINGERPRINT_AUTHENTICATION_THRESHOLD)); - + List biometrics = bioService.captureModalityForAuth(mdmRequestDto); boolean fpMatchStatus = authenticationService.authValidator(userId, SingleType.FINGER.value(), biometrics); if (fpMatchStatus && isPacketAuth) { @@ -1707,7 +1704,7 @@ protected boolean captureAndValidateFace(String userId, boolean isPacketAuth, bo } return match; } - + private void addOperatorBiometrics(List biometrics, boolean isReviewer) { if (isReviewer) { RegistrationDTO registrationDTO = (RegistrationDTO) SessionContext.getInstance().getMapObject() @@ -1719,7 +1716,7 @@ private void addOperatorBiometrics(List biometrics, boolean isRev registrationDTO.addOfficerBiometrics(biometrics); } } - + protected void showAlertAndLogout() { /* Generate alert */ Alert logoutAlert = createAlert(AlertType.INFORMATION, RegistrationUIConstants.getMessageLanguageSpecific(RegistrationUIConstants.SYNC_SUCCESS),RegistrationUIConstants.getMessageLanguageSpecific(RegistrationUIConstants.ALERT_NOTE_LABEL), @@ -1727,7 +1724,7 @@ protected void showAlertAndLogout() { RegistrationConstants.OK_MSG, null); logoutAlert.show(); - Rectangle2D screenSize = Screen.getPrimary().getVisualBounds(); + Rectangle2D screenSize = Screen.getPrimary().getVisualBounds(); Double xValue = screenSize.getWidth()/2 - logoutAlert.getWidth() + 250; Double yValue = screenSize.getHeight()/2 - logoutAlert.getHeight(); logoutAlert.hide(); diff --git a/registration/registration-client/src/main/java/io/mosip/registration/controller/GenericController.java b/registration/registration-client/src/main/java/io/mosip/registration/controller/GenericController.java index c79a6b74c2d..5e7a2b2ee88 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/controller/GenericController.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/controller/GenericController.java @@ -15,6 +15,9 @@ import java.util.TreeMap; import java.util.stream.Collectors; +import javafx.beans.binding.Bindings; +import javafx.geometry.Insets; +import javafx.scene.layout.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -73,12 +76,6 @@ import javafx.scene.control.TabPane; import javafx.scene.control.TextField; import javafx.scene.control.Tooltip; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.ColumnConstraints; -import javafx.scene.layout.FlowPane; -import javafx.scene.layout.GridPane; -import javafx.scene.layout.HBox; -import javafx.scene.layout.RowConstraints; import javafx.scene.web.WebView; import javafx.stage.Stage; import lombok.SneakyThrows; @@ -195,17 +192,22 @@ private HBox getPreRegistrationFetchComponent() { hBox.setSpacing(20); hBox.setPrefHeight(100); hBox.setPrefWidth(200); + hBox.getStyleClass().add(RegistrationConstants.DEMOGRAPHIC_GROUP); + hBox.setPadding(new Insets(20, 0, 20, 0)); Label label = new Label(); label.getStyleClass().add(LABEL_CLASS); label.setId("preRegistrationLabel"); label.setText(ApplicationContext.getBundle(langCode, RegistrationConstants.LABELS) .getString("applicationId")); + label.getStyleClass().add(RegistrationConstants.DEMOGRAPHIC_GROUP_LABEL); + label.setPadding(new Insets(0, 0, 0, 55)); hBox.getChildren().add(label); + TextField textField = new TextField(); textField.setId("preRegistrationId"); - textField.getStyleClass().add(TEXTFIELD_CLASS); hBox.getChildren().add(textField); + Button button = new Button(); button.setId("fetchBtn"); button.getStyleClass().add("demoGraphicPaneContentButton"); @@ -742,22 +744,53 @@ public void populateScreens() throws Exception { } for(Entry> groupEntry : screenFieldGroups.entrySet()) { - FlowPane groupFlowPane = new FlowPane(); + GridPane groupFlowPane = new GridPane(); groupFlowPane.prefWidthProperty().bind(gridPane.widthProperty()); groupFlowPane.setHgap(20); groupFlowPane.setVgap(20); + if(screenDTO.getName().equals("DemographicDetails")) { + groupFlowPane.getStyleClass().add(RegistrationConstants.DEMOGRAPHIC_GROUP); + groupFlowPane.setPadding(new Insets(20, 0, 20, 0)); + + /* Adding Group label */ + Label label = new Label(groupEntry.getKey()); + label.getStyleClass().add(RegistrationConstants.DEMOGRAPHIC_GROUP_LABEL); + label.setPadding(new Insets(0, 0, 0, 55)); + label.setPrefWidth(1200); + groupFlowPane.add(label, 0, 0, 2, 1); + } + int fieldIndex=0; for(UiFieldDTO fieldDTO : groupEntry.getValue()) { try { FxControl fxControl = buildFxElement(fieldDTO); if(fxControl.getNode() instanceof GridPane) { ((GridPane)fxControl.getNode()).prefWidthProperty().bind(groupFlowPane.widthProperty()); } + + if(screenDTO.getName().equals("DemographicDetails")) { + fxControl.getNode().getStyleClass().add(RegistrationConstants.DEMOGRAPHIC_FIELD); + groupFlowPane.add( fxControl.getNode(), (fieldIndex % 2), (fieldIndex / 2) + 1); + fieldIndex++; + } else { + if(screenDTO.getName().equals("Documents")) { + fxControl.getNode().getStyleClass().add(RegistrationConstants.DOCUMENT_COMBOBOX_FIELD); + } groupFlowPane.getChildren().add(fxControl.getNode()); + } } catch (Exception exception){ LOGGER.error("Failed to build control " + fieldDTO.getId(), exception); } } + + //Hide introducer grouping for adults + if(groupEntry.getKey().equals("Introducer")) { + groupFlowPane.visibleProperty().bind(Bindings.or( + groupFlowPane.getChildren().get(1).visibleProperty(), + groupFlowPane.getChildren().get(2).visibleProperty()) + ); + } + gridPane.add(groupFlowPane, 0, rowIndex++); } diff --git a/registration/registration-client/src/main/java/io/mosip/registration/controller/device/BiometricsController.java b/registration/registration-client/src/main/java/io/mosip/registration/controller/device/BiometricsController.java index f4840498a13..5e39be49e31 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/controller/device/BiometricsController.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/controller/device/BiometricsController.java @@ -1620,7 +1620,7 @@ public void handle(final MouseEvent mouseEvent) { if (qualityScoreVal != 0) { updateByAttempt(qualityScoreVal, getBioStreamImage(currentSubType, Modality.valueOf(currentModality), attempt), getThresholdScoreInInt(getThresholdKeyByBioType(Modality.valueOf(currentModality))), biometricImage, - qualityText, bioProgress, qualityScore); + qualityText, bioProgress); } LOGGER.info(LOG_REG_BIOMETRIC_CONTROLLER, APPLICATION_NAME, APPLICATION_ID, diff --git a/registration/registration-client/src/main/java/io/mosip/registration/controller/device/GenericBiometricsController.java b/registration/registration-client/src/main/java/io/mosip/registration/controller/device/GenericBiometricsController.java index ede02594d1a..8a19fa2102d 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/controller/device/GenericBiometricsController.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/controller/device/GenericBiometricsController.java @@ -111,21 +111,9 @@ public class GenericBiometricsController extends BaseController { @FXML private ImageView biometricImage; - @FXML - private Label qualityScore; - - @FXML - private Label attemptSlap; - - @FXML - private Label thresholdScoreLabel; - - @FXML - private Label thresholdLabel; - @FXML private GridPane biometricPane; - + @FXML private GridPane biometric; @@ -151,7 +139,7 @@ public class GenericBiometricsController extends BaseController { private Label guardianBiometricsLabel; @FXML - private ImageView scanImageView; + private ImageView scanImageView; @FXML private ImageView closeButtonImageView; @@ -471,18 +459,18 @@ protected Task createTask() { @Override protected MdmBioDevice call() throws RegBaseCheckedException { LOGGER.info("device search request started {}", System.currentTimeMillis()); - + String modality = isFace(currentModality) || isExceptionPhoto(currentModality) ? - RegistrationConstants.FACE_FULLFACE : currentModality.name(); - MdmBioDevice bioDevice =deviceSpecificationFactory.getDeviceInfoByModality(modality); - - if (deviceSpecificationFactory.isDeviceAvailable(bioDevice)) { - return bioDevice; - } else { - throw new RegBaseCheckedException( - RegistrationExceptionConstants.MDS_BIODEVICE_NOT_FOUND.getErrorCode(), - RegistrationExceptionConstants.MDS_BIODEVICE_NOT_FOUND.getErrorMessage()); - } + RegistrationConstants.FACE_FULLFACE : currentModality.name(); + MdmBioDevice bioDevice =deviceSpecificationFactory.getDeviceInfoByModality(modality); + + if (deviceSpecificationFactory.isDeviceAvailable(bioDevice)) { + return bioDevice; + } else { + throw new RegBaseCheckedException( + RegistrationExceptionConstants.MDS_BIODEVICE_NOT_FOUND.getErrorCode(), + RegistrationExceptionConstants.MDS_BIODEVICE_NOT_FOUND.getErrorMessage()); + } } }; } @@ -845,7 +833,6 @@ private void updateBiometric(Modality bioType, String bioImage, double biometric LOGGER.error("Error while getting image"); } - thresholdScoreLabel.setText(getQualityScoreText(biometricThreshold)); createQualityBox(retryCount, biometricThreshold); clearBioLabels(); @@ -863,8 +850,6 @@ private void clearBioLabels() { clearCaptureData(); biometricPane.getStyleClass().clear(); biometricPane.getStyleClass().add(RegistrationConstants.BIOMETRIC_PANES_SELECTED); - qualityScore.setText(RegistrationConstants.HYPHEN); - attemptSlap.setText(RegistrationConstants.HYPHEN); // duplicateCheckLbl.setText(RegistrationConstants.EMPTY); retryBox.setVisible(!isExceptionPhoto(currentModality)); @@ -889,8 +874,6 @@ private void setCapturedValues(double qltyScore, int retry, double thresholdValu biometricPane.getStyleClass().clear(); biometricPane.getStyleClass().add(RegistrationConstants.FINGERPRINT_PANES_SELECTED); - qualityScore.setText(getQualityScoreText(qltyScore)); - attemptSlap.setText(String.valueOf(retry)); bioProgress.setProgress( Double.valueOf(getQualityScoreText(qltyScore).split(RegistrationConstants.PERCENTAGE)[0]) / 100); @@ -951,9 +934,9 @@ public void handle(final MouseEvent mouseEvent) { double qualityScoreVal = getBioScores(fxControl.getUiSchemaDTO().getId(), currentModality, attempt); //if (qualityScoreVal != 0) { - updateByAttempt(qualityScoreVal, getBioStreamImage(fxControl.getUiSchemaDTO().getId(), currentModality, attempt), - bioService.getMDMQualityThreshold(currentModality), biometricImage, - qualityText, bioProgress, qualityScore); + updateByAttempt(qualityScoreVal, getBioStreamImage(fxControl.getUiSchemaDTO().getId(), currentModality, attempt), + bioService.getMDMQualityThreshold(currentModality), biometricImage, + qualityText, bioProgress); //} LOGGER.info("Mouse Event by attempt Ended. modality : {}", currentModality); @@ -975,14 +958,12 @@ public void handle(final MouseEvent mouseEvent) { bioRetryBox.getChildren().add(label); } bioRetryBox.setOnMouseClicked(mouseEventHandler); - thresholdLabel.setAlignment(Pos.CENTER); String langCode = ApplicationContext.applicationLanguage(); if (getRegistrationDTOFromSession() != null && getRegistrationDTOFromSession().getSelectedLanguagesByApplicant() != null) { langCode = getRegistrationDTOFromSession().getSelectedLanguagesByApplicant().get(0); } - thresholdLabel.setText(applicationContext.getBundle(langCode, RegistrationConstants.LABELS).getString("threshold").concat(" ").concat(String.valueOf(biometricThreshold)) - .concat(RegistrationConstants.PERCENTAGE)); + thresholdPane1.setPercentWidth(biometricThreshold); thresholdPane2.setPercentWidth(100.00 - (biometricThreshold)); LOGGER.info("Updated Quality and threshold values of biometrics"); @@ -1154,7 +1135,7 @@ private BIR buildBir(byte[] biometricImageISO, BiometricType modality) { private Pane getExceptionImagePane(Modality modality, List configBioAttributes, - List nonConfigBioAttributes, String fieldId) { + List nonConfigBioAttributes, String fieldId) { LOGGER.info("Getting exception image pane for modality : {}", modality); Pane exceptionImagePane = getExceptionImagePane(modality); @@ -1200,7 +1181,7 @@ public void updateBiometricData(ImageView clickedImageView, List bioE private void addExceptionsUiPane(Pane pane, List configBioAttributes, List nonConfigBioAttributes, - Modality modality, String fieldId) { + Modality modality, String fieldId) { if(pane == null || pane.getChildren() == null) { LOGGER.debug("Nothing to add in exception images ui pane"); @@ -1371,7 +1352,7 @@ private Pane getTwoIrisSlabExceptionPane(Modality modality) { } private ImageView getImageView(String id, String imageName, double fitHeight, double fitWidth, double layoutX, - double layoutY, boolean pickOnBounds, boolean preserveRatio, boolean hasActionEvent) { + double layoutY, boolean pickOnBounds, boolean preserveRatio, boolean hasActionEvent) { LOGGER.info("Started Preparing exception image view for : {}", id); @@ -1404,7 +1385,7 @@ private ImageView getImageView(String id, String imageName, double fitHeight, do LOGGER.error("Exception while getting image",exception); } - + return imageView; } @@ -1433,7 +1414,7 @@ public void addException(MouseEvent event) { } public void init(FxControl fxControl, Modality modality, List configBioAttributes, - List nonConfigBioAttributes) throws IOException { + List nonConfigBioAttributes) throws IOException { this.fxControl = (BiometricFxControl) fxControl; this.currentModality = modality; @@ -1456,13 +1437,10 @@ public void init(FxControl fxControl, Modality modality, List configBioA } public void initializeWithoutStage(FxControl fxControl, Modality modality, List configBioAttributes, - List nonConfigBioAttributes) { + List nonConfigBioAttributes) { this.fxControl = (BiometricFxControl) fxControl; this.scanBtn.setId(this.fxControl.getUiSchemaDTO().getId()+"ScanBtn"); - this.attemptSlap.setId(this.fxControl.getUiSchemaDTO().getId()+"AttemptSlap"); - this.thresholdScoreLabel.setId(this.fxControl.getUiSchemaDTO().getId()+"ThresholdScoreLabel"); - this.qualityScore.setId(this.fxControl.getUiSchemaDTO().getId()+"QualityScore"); this.currentModality = modality; this.configBioAttributes = configBioAttributes; this.nonConfigBioAttributes = nonConfigBioAttributes; @@ -1471,7 +1449,7 @@ public void initializeWithoutStage(FxControl fxControl, Modality modality, List< /** * event class to exit from present pop up window. - * + * * @param event */ public void exitWindow(ActionEvent event) { diff --git a/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/BiometricFxControl.java b/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/BiometricFxControl.java index 13c8194176b..060b4f728a9 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/BiometricFxControl.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/BiometricFxControl.java @@ -189,11 +189,11 @@ private String getBiometricFieldLayout() { private GridPane createGridPane() { GridPane gridPane = new GridPane(); - gridPane.setPadding(new Insets(50, 0, 0, 0)); + gridPane.setPadding(new Insets(12, 0, 0, 0)); RowConstraints topRowConstraints = new RowConstraints(); - topRowConstraints.setPercentHeight(5); + topRowConstraints.setPercentHeight(4); RowConstraints midRowConstraints = new RowConstraints(); - midRowConstraints.setPercentHeight(95); + midRowConstraints.setPercentHeight(96); gridPane.getRowConstraints().addAll(topRowConstraints,midRowConstraints); ColumnConstraints columnConstraint1 = new ColumnConstraints(); diff --git a/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DocumentFxControl.java b/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DocumentFxControl.java index e425ce7ca72..212fb1e7059 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DocumentFxControl.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DocumentFxControl.java @@ -33,6 +33,7 @@ import io.mosip.registration.validator.RequiredFieldValidator; import javafx.event.ActionEvent; import javafx.event.EventHandler; +import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ComboBox; @@ -181,12 +182,8 @@ private GridPane createScanButton(UiFieldDTO uiFieldDTO) { new Image(this.getClass().getResourceAsStream(RegistrationConstants.SCAN), 12, 12, true, true))); GridPane scanButtonGridPane = new GridPane(); - RowConstraints rowConstraint1 = new RowConstraints(); - RowConstraints rowConstraint2 = new RowConstraints(); - rowConstraint1.setPercentHeight(35); - rowConstraint2.setPercentHeight(65); - scanButtonGridPane.getRowConstraints().addAll(rowConstraint1, rowConstraint2); scanButtonGridPane.setPrefWidth(80); + scanButtonGridPane.setPadding(new Insets(21, 0, 0, 0)); scanButtonGridPane.add(scanButton, 0, 1); return scanButtonGridPane; diff --git a/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DropDownFxControl.java b/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DropDownFxControl.java index e6b4d9aac69..ea182500ae6 100644 --- a/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DropDownFxControl.java +++ b/registration/registration-client/src/main/java/io/mosip/registration/util/control/impl/DropDownFxControl.java @@ -5,6 +5,7 @@ import io.mosip.registration.controller.ClientApplication; import io.mosip.registration.dao.MasterSyncDao; +import javafx.geometry.Insets; import org.springframework.context.ApplicationContext; import io.mosip.registration.dto.mastersync.GenericDto; @@ -111,7 +112,10 @@ private VBox create(UiFieldDTO uiFieldDTO, String langCode) { String titleText = String.join(RegistrationConstants.SLASH, labels) + getMandatorySuffix(uiFieldDTO); ComboBox comboBox = getComboBox(fieldName, titleText, RegistrationConstants.DOC_COMBO_BOX, simpleTypeVBox.getPrefWidth(), false); + comboBox.setMaxWidth(Double.MAX_VALUE); simpleTypeVBox.getChildren().add(comboBox); + simpleTypeVBox.setMargin(comboBox, new Insets(0, 15, 0, 0)); + comboBox.setOnMouseExited(event -> { getField(uiFieldDTO.getId() + RegistrationConstants.MESSAGE).setVisible(false); @@ -171,9 +175,6 @@ private ComboBox getComboBox(String id, String titleText, String ComboBox field = new ComboBox(); StringConverter uiRenderForComboBox = FXUtils.getInstance().getStringConverterForComboBox(); field.setId(id); - // field.setPrefWidth(prefWidth); - - //field.setPromptText(titleText); field.setDisable(isDisable); field.getStyleClass().add(RegistrationConstants.DEMOGRAPHIC_COMBOBOX); field.setConverter((StringConverter) uiRenderForComboBox); diff --git a/registration/registration-client/src/main/resources/application.css b/registration/registration-client/src/main/resources/application.css index 382f249cfaf..5ffa296cf89 100644 --- a/registration/registration-client/src/main/resources/application.css +++ b/registration/registration-client/src/main/resources/application.css @@ -1040,7 +1040,6 @@ Working on new Css by taleev -fx-border-color: #C9C9C9; -fx-font-size: 14.0px; -fx-pref-height: 10.0px; - -fx-pref-width: 190.0px; } .loginCombobox { @@ -1074,7 +1073,6 @@ Working on new Css by taleev -fx-border-color: red; -fx-font-size: 14.0px; -fx-pref-height: 10.0px; - -fx-pref-width: 190.0px; } .demographicCombobox:focused { @@ -1083,7 +1081,6 @@ Working on new Css by taleev -fx-border-color: #005baa; -fx-font-size: 14.0px; -fx-pref-height: 10.0px; - -fx-pref-width: 190.0px; } .demographicCombobox .combo-box-popup>.list-view>.virtual-flow>.clipped-container>.sheet>.list-cell:filled:hover @@ -1169,7 +1166,7 @@ Working on new Css by taleev } .fingerPrintPanesSelected { - -fx-background-color: #F0F0F0; + -fx-background-color: #FFFFFF; -fx-border-color: #EFEFEF; -fx-border-width: 5.0; -fx-padding: -2.5; @@ -1177,7 +1174,7 @@ Working on new Css by taleev } .IrisPanes { - -fx-background-color: #F0F0F0; + -fx-background-color: #FFFFFF; -fx-border-color: #EFEFEF; -fx-border-width: 5.0; -fx-padding: -2.5; @@ -2672,4 +2669,29 @@ Working on new Css by taleev .tab:selected.tabErrorLabel .tab-label { -fx-text-fill: #FF0000; -fx-font-weight: bold; -} \ No newline at end of file +} + +.preRegParentPaneSection { + -fx-border-color:#005baa; + -fx-border-radius: 10.0 10.0 10.0 10.0; +} + +.demoGraphicCustomLabel { + -fx-background-color: #ffffff; + -fx-border-width: 0.0; + -fx-text-fill: #005baa; + -fx-font-size: 1.2em; + -fx-font-weight: 800; +} + +.demoGraphicCustomField{ + -fx-padding: 0 0 0 55; +} + +.height { + -fx-pref-height: 100.0; +} + +.documentCustomCombobox { + -fx-pref-height: 77.0; +} diff --git a/registration/registration-client/src/main/resources/fxml/BiometricsCapture.fxml b/registration/registration-client/src/main/resources/fxml/BiometricsCapture.fxml index c5df4dd4267..2e26e26dd2e 100644 --- a/registration/registration-client/src/main/resources/fxml/BiometricsCapture.fxml +++ b/registration/registration-client/src/main/resources/fxml/BiometricsCapture.fxml @@ -5,16 +5,15 @@ - + - - + + - @@ -47,9 +46,9 @@ - - - + + + @@ -63,7 +62,6 @@ - @@ -109,28 +107,6 @@ - - - - - - - - - - - - - - @@ -151,9 +127,7 @@ - - - + diff --git a/registration/registration-services/src/main/java/io/mosip/registration/constants/RegistrationConstants.java b/registration/registration-services/src/main/java/io/mosip/registration/constants/RegistrationConstants.java index 4ac0414a7b8..5972308f0b2 100644 --- a/registration/registration-services/src/main/java/io/mosip/registration/constants/RegistrationConstants.java +++ b/registration/registration-services/src/main/java/io/mosip/registration/constants/RegistrationConstants.java @@ -509,6 +509,11 @@ private RegistrationConstants() { public static final String TEMPLATE_DEMO_INFO = "DemographicInfo"; public static final String DEMOGRAPHIC_TEXTFIELD_FOCUSED = "demoGraphicTextFieldFocused"; public static final String DEMOGRAPHIC_TEXTFIELD = "demoGraphicTextField"; + public static final String DEMOGRAPHIC_GROUP = "preRegParentPaneSection"; + public static final String DEMOGRAPHIC_GROUP_LABEL = "demoGraphicCustomLabel"; + public static final String DEMOGRAPHIC_FIELD = "demoGraphicCustomField"; + public static final String DOCUMENT_COMBOBOX_FIELD = "documentCustomCombobox"; + public static final String TEMPLATE_DOCUMENTS_LABEL = "DocumentsLabel"; public static final String TEMPLATE_DOCUMENTS = "Documents"; public static final String TEMPLATE_BIOMETRICS_LABEL = "BiometricsLabel";