Merge branch 'KIME-5209' into 'master'

[TASK] Allow required mapping property

See merge request !23

Classes/WE/SpreadsheetImport/Annotations/Mapping.php

@@ -40,6 +40,13 @@ final class Mapping {
 	 */
 	public $identifier = FALSE;
 
+	/**
+	 * Flag if property is handled as required mapping
+	 *
+	 * @var boolean
+	 */
+	public $required = FALSE;
+
 	/**
 	 * Overwrite the default getter for previews
 	 *

Resources/Private/Templates/SpreadsheetImport/Mapping.html

@@ -18,18 +18,32 @@
 						</f:else>
 					</f:if>
 					<f:if condition="{columnMapping.mapping.identifier}">
+						<f:then>
+							<span class="require"> * </span>
+						</f:then>
+						<f:else>
+							<f:if condition="{columnMapping.mapping.required}">
 								<span class="require"> * </span>
 							</f:if>
+						</f:else>
+					</f:if>
 				</label>
 				<div>
 					<f:if condition="{spreadsheetImport.importingStatus} == 0">
 						<f:then>
 							<f:if condition="{columnMapping.mapping.identifier}">
 								<f:then>
-									<f:form.select name="{property}" options="{spreadsheetColumns}" prependOptionLabel="{f:translate(id: 'label.please_select')}" value="{columnMapping.column}" additionalAttributes="{required: 1}" />
+									<f:form.select class="form-control select-mapping-column" name="{property}" options="{spreadsheetColumns}" prependOptionLabel="{f:translate(id: 'label.please_choose')}" value="{columnMapping.column}" additionalAttributes="{required: 1}" />
 								</f:then>
 								<f:else>
-									<f:form.select name="{property}" options="{spreadsheetColumns}" prependOptionLabel="{f:translate(id: 'label.please_select')}" value="{columnMapping.column}" />
+									<f:if condition="{columnMapping.mapping.required}">
+										<f:then>
+											<f:form.select class="form-control select-mapping-column" name="{property}" options="{spreadsheetColumns}" prependOptionLabel="{f:translate(id: 'label.please_choose')}" value="{columnMapping.column}" additionalAttributes="{required: 1}" />
+										</f:then>
+										<f:else>
+											<f:form.select class="form-control select-mapping-column" name="{property}" options="{spreadsheetColumns}" prependOptionLabel="{f:translate(id: 'label.please_choose')}" value="{columnMapping.column}" />
+										</f:else>
+									</f:if>
 								</f:else>
 							</f:if>
 						</f:then>