| ';
@@ -1261,15 +1229,42 @@ if ($step == 4 && $datatoimport && $selectimport) {
print '$(".targetselectchange").focus(function(){'."\n";
print 'previousselectedvalueimport = $(this).val();'."\n";
print 'previousselectedlabelimport = $(this).children("option:selected").text();'."\n";
+ print 'console.log(previousselectedvalueimport)'."\n";
print '})'."\n";
print '$(".targetselectchange").change(function(){'."\n";
print 'if(previousselectedlabelimport != "" && previousselectedvalueimport != -1){'."\n";
- print '$(".targetselectchange").not($( this )).append(new Option(previousselectedlabelimport,previousselectedvalueimport));'."\n";
+ print '$(".targetselectchange").not($(this)).append(new Option(previousselectedlabelimport,previousselectedvalueimport));'."\n";
+ print 'let valuetochange = $(this).val(); '."\n";
+ print '$(".boxtdunused").each(function(){'."\n";
+ print 'if ($(this).text().includes(valuetochange)){'."\n";
+ print 'arraychild = $(this)[0].childNodes'."\n";
+ print 'arraytexttomodify = arraychild[0].textContent.split(" ")'."\n";
+ print 'arraytexttomodify[1] = previousselectedvalueimport '."\n";
+ print 'textmodified = arraytexttomodify.join(" ") '."\n";
+ print 'arraychild[0].textContent = textmodified'."\n";
+ print 'arraychild[1].innerHTML = previousselectedlabelimport'."\n";
+ print '}'."\n";
+ print '})'."\n";
print '}'."\n";
print 'if($( this ).val() != -1){'."\n";
print '$(".targetselectchange").not($( this )).find(\'option[value="\'+$( this ).val()+\'"]\').remove();'."\n";
- print '$(".targetselectchange").not($( this )).find(\'option[value="\'+$( this ).val()+\'"]\').remove();'."\n";
print '}'."\n";
+ print '$(this).blur()'."\n";
+ print 'arrayselectedfields = [];'."\n";
+ print 'arrayselectedfields.push("0");'."\n";
+ print '$(".targetselectchange").each(function(){'."\n";
+ print 'value = $(this).val()'."\n";
+ print 'arrayselectedfields.push(value);'."\n";
+ print '});'."\n";
+ print '$.ajax({'."\n";
+ print 'type: "POST",'."\n";
+ print 'dataType: "json",'."\n";
+ print 'url: "'.$_SERVER["PHP_SELF"].'?action=saveselectorder",'."\n";
+ print 'data: "selectorder="+arrayselectedfields.toString(),'."\n";
+ print 'success: function(){'."\n";
+ print 'console.log("Select order saved");'."\n";
+ print '},'."\n";
+ print '});'."\n";
print '});'."\n";
print '})'."\n";
print ''."\n";
@@ -1282,31 +1277,10 @@ if ($step == 4 && $datatoimport && $selectimport) {
if (count($array_match_file_to_database)) {
if ($mandatoryfieldshavesource) {
- print ''.$langs->trans("NextStep").'';
+ print ''.$langs->trans("NextStep").'';
} else {
print ''.$langs->trans("NextStep").'';
}
- if ($conf->use_javascript_ajax) {
- print ''."\n";
- }
}
print '';
@@ -2238,7 +2212,11 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
//print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
print ' | ';
- print '';
+ if (isset($fieldssource[$pos]['imported']) && $fieldssource[$pos]['imported'] == false) {
+ print ' | ';
+ } else {
+ print ' | ';
+ }
print $langs->trans("Field").' '.$pos;
if (empty($fieldssource[$pos]['example1'])) {
$example = $fieldssource[$pos]['label'];
@@ -2289,3 +2267,30 @@ function getnewkey(&$fieldssource, &$listofkey)
$listofkey[$i] = 1;
return $i;
}
+/**
+ * Return array with element inserted in it at position $position
+ *
+ * @param array $array Array of field source
+ * @param mixed $position key of postion to insert to
+ * @param array $insertArray Array to insert
+ * @return array
+ */
+function arrayInsert($array, $position, $insertArray)
+{
+ $ret = [];
+
+ if ($position == count($array)) {
+ $ret = $array + $insertArray;
+ } else {
+ $i = 0;
+ foreach ($array as $key => $value) {
+ if ($position == $i++) {
+ $ret += $insertArray;
+ }
+
+ $ret[$key] = $value;
+ }
+ }
+
+ return $ret;
+}
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index a20741472b7..44cb98d3679 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -136,3 +136,4 @@ NbUpdate=Number of updated lines: %s
MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
WarningFirstImportedLine=The first line(s) will not be imported with the current selection
+NotUsedFields=Fields of database not used
\ No newline at end of file
|