Rintagi
diff --git a/‎Common3/Data/UsrImpr.cs
Lines changed: 21 additions & 3 deletions b/‎Common3/Data/UsrImpr.cs
Lines changed: 21 additions & 3 deletions
diff --git a/‎Common3/Encryption.cs
Lines changed: 2 additions & 1 deletion b/‎Common3/Encryption.cs
Lines changed: 2 additions & 1 deletion
diff --git a/‎Common3/Utils.cs
Lines changed: 5 additions & 5 deletions b/‎Common3/Utils.cs
Lines changed: 5 additions & 5 deletions
diff --git a/‎DeploySetup/rintagi_machine_setup_install_prerequisite.ps1
Lines changed: 1 addition & 1 deletion b/‎DeploySetup/rintagi_machine_setup_install_prerequisite.ps1
Lines changed: 1 addition & 1 deletion
diff --git a/‎React/Adm/src/components/custom/AutoCompleteField.js
Lines changed: 1 addition & 1 deletion b/‎React/Adm/src/components/custom/AutoCompleteField.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎React/Adm/src/components/custom/FileInput.js
Lines changed: 28 additions & 22 deletions b/‎React/Adm/src/components/custom/FileInput.js
Lines changed: 28 additions & 22 deletions
diff --git a/‎React/Adm/src/components/custom/FileInputV1.js
Lines changed: 26 additions & 6 deletions b/‎React/Adm/src/components/custom/FileInputV1.js
Lines changed: 26 additions & 6 deletions
diff --git a/‎React/Adm/src/components/custom/ListBox.js
Lines changed: 61 additions & 0 deletions b/‎React/Adm/src/components/custom/ListBox.js
Lines changed: 61 additions & 0 deletions
diff --git a/‎React/Adm/src/components/custom/Screen.js
Lines changed: 13 additions & 0 deletions b/‎React/Adm/src/components/custom/Screen.js
Lines changed: 13 additions & 0 deletions
@@ -29,9 +29,27 @@ public class UsrImpr
         public UsrImpr() {}
         private string Merge(string ls1, string ls2)
         {
-            List<string> l1 = (ls1 ?? "").Split(new char[] { (char)191 }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            List<string> l2 = (ls2 ?? "").Split(new char[] { (char)191 }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            return string.Join(((char)191).ToString(), l1.Concat(l2).Distinct().ToArray());
+            List<string> lo = new List<string>();
+            HashSet<string> v = new HashSet<string>();
+            string[] l1 = (ls1 ?? "").Split(new char[] { (char)191 }, StringSplitOptions.RemoveEmptyEntries);
+            string[] l2 = (ls2 ?? "").Split(new char[] { (char)191 }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (string s in l1)
+            {
+                if (!v.Contains(s)) {
+                    lo.Add(s);
+                    v.Add(s);
+                }
+            }
+            foreach (string s in l2)
+            {
+                if (!v.Contains(s))
+                {
+                    lo.Add(s);
+                    v.Add(s);
+                }
+            }
+
+            return string.Join(((char)191).ToString(), lo.ToArray());
 
         }
         public UsrImpr(string usrs, string usrGroups, string cultures, string rowAuthoritys, string companys, string projects, string investors, string customers, string vendors, string agents, string brokers, string members, string borrowers, string guarantors, string lenders)
 
@@ -12,6 +12,7 @@ namespace RO.Common3
     public class Encryption: Key
     {
 		private string pExpiryDt = "9999.12.01";
+        	public const string ROVersion = "20200228";
 		// RCEncryption uses TripleDES algorithm to encrypt and/or decrypt an input string.
 		// By default a key is used to do the decryption, this key should be the same for decryption and encryption.
 
@@ -202,7 +203,7 @@ public Tuple<string, bool, string> DecodeLicenseString(string _licenseStringBase
         }
 
 
-        public string RenewLicense(string LicenseServerEndPoint)
+        public string RenewLicense(string LicenseServerEndPoint, string InstallID=null, string AppId = null, string AppNameSpace = null)
         {
             return null;
         }
 
@@ -1356,10 +1356,10 @@ public static bool IsFullyLicense(string moduleName, string resourceName)
             RO.Common3.Encryption e = new RO.Common3.Encryption();
             return e.CheckValidLicense(moduleName, resourceName);
         }
-        public static string RenewLicense(string LicenseServerEndPoint = null)
+        public static string RenewLicense(string LicenseServerEndPoint = null, string InstallID = null, string AppId = null, string AppNameSpace = null)
         {
             RO.Common3.Encryption e = new RO.Common3.Encryption();
-            return e.RenewLicense(LicenseServerEndPoint);
+            return e.RenewLicense(LicenseServerEndPoint, InstallID, AppId, AppNameSpace);
         }
 
         public static List<DataStructure> AnalyseExcelData(DataTable dtImp, int rowsToExamine)
@@ -1437,7 +1437,7 @@ public static List<DataStructure> AnalyseExcelData(DataTable dtImp, int rowsToEx
             return (from x in columns where !string.IsNullOrEmpty(x.ColumnName) select x).ToList();
         }
 
-        public static void DirectoryCleanup(string sourceDirName, string searchPattern, bool recursve = false)
+        public static void DirectoryCleanup(string sourceDirName, string searchPattern, bool recursive = false)
         {
             if (string.IsNullOrEmpty(searchPattern)) return;
 
@@ -1460,15 +1460,15 @@ public static void DirectoryCleanup(string sourceDirName, string searchPattern,
                 { }
             }
 
-            if (recursve)
+            if (recursive)
             {
                 // Get the subdirectories for the specified directory.
                 try
                 {
                     DirectoryInfo[] dirs = dir.GetDirectories();
                     foreach (DirectoryInfo subdir in dirs)
                     {
-                        DirectoryCleanup(subdir.FullName, searchPattern, recursve);
+                        DirectoryCleanup(subdir.FullName, searchPattern, recursive);
                     }
                 }
                 catch { }
 
@@ -1,6 +1,6 @@
 Write-Output "Install chocolatey"
 
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
 
 choco feature enable -n allowGlobalConfirmation
 
 
@@ -138,7 +138,7 @@ export default class AutoCompleteField extends Component {
 
   render() {
     return (
-      <div className='form__form-group-input-wrap'>
+      <div className={`${this.props.className} form__form-group-input-wrap`}>
         <Fragment>
           <Typeahead
             ref={(typeahead) => this.typeahead = typeahead}
 
@@ -8,7 +8,9 @@ import { Row, Col, Spinner } from 'reactstrap';
 import { showNotification } from '../../redux/Notification';
 import Skeleton from 'react-skeleton-loader';
 import { formatBytes } from '../../helpers/formatter';
-import { previewContent,uuid } from '../../helpers/utils';
+import { previewContent, uuid } from '../../helpers/utils';
+import moment from 'moment';
+
 function calcSize(width, height, max_width, max_height, noSwap) {
 
   if (!max_height && !max_width) return { width, height };
@@ -135,7 +137,7 @@ function getFile(file, index, options, success, state, setState) {
           // Resizing image
           var canvas = document.createElement('canvas');
           var ctx = canvas.getContext("2d");
-          
+
           ctx.drawImage(img, 0, 0);
 
           // var options = _this.props.options || {};
@@ -363,22 +365,22 @@ class FileInputField extends Component {
       fileSig: previewSig,
     };
     /* window.open MUST BE DONE here in the click even function or it would be blocked by popup blocker */
-    sessionStorage.setItem("PreviewAttachment",JSON.stringify({...dataObj,fileSig:previewSig}));
-    const win = (!isIE || isImage) && !download && window.open(envPublicUrl + '/helper/showAttachment.html' + '?fileSig=' + previewSig,'_blank');
+    sessionStorage.setItem("PreviewAttachment", JSON.stringify({ ...dataObj, fileSig: previewSig }));
+    const win = (!isIE || isImage) && !download && window.open(envPublicUrl + '/helper/showAttachment.html' + '?fileSig=' + previewSig, '_blank');
     previewContent({
-        dataObj:dataObj
-        , download:false
-        , winObj:win
-        , dataPromise:undefined
-        , previewSig:previewSig
-        , containerUrl: envPublicUrl + '/helper/showAttachment.html'
-      });
+      dataObj: dataObj
+      , download: false
+      , winObj: win
+      , dataPromise: undefined
+      , previewSig: previewSig
+      , containerUrl: envPublicUrl + '/helper/showAttachment.html'
+    });
     return;
     const makeDoc = (body) => {
       return "<html><header>" + "<title>" + currentUrlTitle + ' ' + (selectedFile.fileName || '') + "</title>"
         + "<header><body>" + body + "</body></html>"
     }
-    const injectContent = function(file) {
+    const injectContent = function (file) {
       //debugger;
       const header = win.document.getElementById('header');
       const body = win.document.getElementsByTagName('body');
@@ -389,7 +391,7 @@ class FileInputField extends Component {
       const content = addPreviewUrl(selectedFile).contentUrl;
       //const content = 'https://www.youtube.com/embed/01ON04GCwKs'
       //const content = '<iframe width="560" height="315" src="https://www.youtube.com/embed/01ON04GCwKs" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>'
-      win.postMessage(content,"*");
+      win.postMessage(content, "*");
       // if (body[0])
       //   body[0].innerHTML = makeDoc('<iframe src="' + addPreviewUrl(selectedFile).contentUrl + '" frameborder="0" style="position: absolute; border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>');
       // else
@@ -405,7 +407,7 @@ class FileInputField extends Component {
     };
 
     // win.onload = function(){
-      
+
     //   //debugger;
     //   injectContent(selectedFile);
     //   // const header = win.document.getElementById('header');
@@ -624,31 +626,35 @@ class FileInputField extends Component {
                 .map((obj, i) => {
                   return (
                     <div className="dropzone__holder" key={i}>
-                      <div className='dropzone__img pointer' style={{ backgroundImage: 'url(' + addPreviewUrl(obj).previewUrl + ')' }} onClick={this.previewSelectedFile(i)}>
-                        {!(obj || {}).base64 && <Skeleton height="100px" widthRandomness="0" />}
+                      <div className={`dropzone__img pointer ${this.props.disabled && 'rad-4 mb-20'}`} style={{ backgroundImage: 'url(' + addPreviewUrl(obj).previewUrl + ')' }} onClick={this.previewSelectedFile(i)}>
+                        {(!(obj || {}).base64 && !(obj || {}).icon) && <Skeleton height="100px" widthRandomness="0" />}
                         {obj && !(obj.mimeType || '').match(/image/) &&
                           <i className={`fa ${this.icon(i)} fs-38 color-green`}></i>
                         }
-                        <p className='dropzone__img-name truncate-inline'>{obj && ((!obj.base64 ? 'Loading...' : obj.fileName))}</p>
+                        {obj && obj.ts && <p className={`dropzone__img-name truncate-inline pb-17 ${this.props.disabled && 'bblr-4'}`}><u>{moment(obj.ts).format('MMM D, YYYY')}</u></p>}
+                        {obj && obj.InputOn && <p className={`dropzone__img-name truncate-inline pb-17 ${this.props.disabled && 'bblr-4'}`}><u>{moment(obj.InputOn, moment.ISO_8601).format('MMM D, YYYY')}</u></p>}
+                        <p className={`dropzone__img-name truncate-inline ${this.props.disabled && 'bblr-4'}`}>{obj && (((!obj.base64 && !obj.icon) ? 'Loading...' : obj.fileName))}</p>
                       </div>
-                      {!this.props.disabled 
-                        ? <button type='button' className='dropzone__img-delete-custom' onClick={this.removeSelectedFile(i)}>{'Remove'}</button>
-                        : <button type='button' className='dropzone__img-delete-custom' onClick={this.previewSelectedFile(i)}>{'Preview'}</button>
+                      {!this.props.disabled
+                        && <button type='button' className='dropzone__img-delete-custom' onClick={this.removeSelectedFile(i)}>{'Remove'}</button>
                       }
                     </div>
                   )
                 })
             }
+            {(this.state.files || []).length < 1 && this.props.disabled &&
+              <div className="fw-600 m-auto pt-20">No documents in this section</div>
+            }
             {!this.props.disabled && <div className={`dropzone__holder ${filesAmount >= maxAllowed && 'd-none'}`}>
               <label className="dropzone__input-custom" htmlFor={this.props.name || (this.props.field || {}).name}>
                 {!this.props.multiple && (this.state.files || []).length > 0 && <i className="fa fa-repeat"></i>}
                 {!this.props.multiple && (this.state.files || []).length === 0 && (!this.state.progress
                   ? <i className="fa fa-plus"></i>
-                  : <Spinner color="success" style={{ width: '2rem', height: '2rem', marginTop: '35%', marginLeft: '32.5%' }} />
+                  : <Spinner color="success" style={{ width: '2rem', height: '2rem', margin: 'auto' }} />
                 )}
                 {this.props.multiple && (!this.state.progress
                   ? <i className="fa fa-plus"></i>
-                  : <Spinner color="success" style={{ width: '2rem', height: '2rem', marginTop: '35%', marginLeft: '32.5%' }} />
+                  : <Spinner color="success" style={{ width: '2rem', height: '2rem', margin: 'auto' }} />
                 )}
               </label>
               <input
 
@@ -94,9 +94,10 @@ class FileInputField extends Component {
     let reader = new FileReader();
     let file = value.target.files[0] || { type: '' };
     var fileType = file['type'];
+    const actionTimeStamp = Date.now();
 
     reader.fileName = file.name;
-
+    
     if (fileType.split('/')[0] === 'image') {
 
       const _this = this;
@@ -149,7 +150,15 @@ class FileInputField extends Component {
             });
 
             // Passing name and base64 value of our rotated and resized image
-            _this.props.onChange({ name: files[0].name, mimeType: files[0].type, size: files[0].size, width: width, height: height, lastModified: files[0].lastModified, base64: readerResizedImg });
+            _this.props.onChange({ 
+              name: files[0].name, 
+              mimeType: files[0].type, 
+              size: files[0].size, 
+              width: width, 
+              height: height, 
+              ts: actionTimeStamp + 1,
+              lastModified: files[0].lastModified, 
+              base64: readerResizedImg });
           }
         })
       };
@@ -161,7 +170,14 @@ class FileInputField extends Component {
           previewUrl: reader.result,
           fileName: reader.fileName
         });
-        this.props.onChange({ name: files[0].name, mimeType: files[0].type, size: files[0].size, lastModified: files[0].lastModified, base64: reader });
+        this.props.onChange({ 
+          name: files[0].name, 
+          mimeType: files[0].type, 
+          size: files[0].size, 
+          lastModified: files[0].lastModified, 
+          ts: actionTimeStamp + 1,
+          base64: reader 
+        });
         // this.props.onChange({ name: files[0].name, base64: reader });
       };
     }
@@ -210,7 +226,11 @@ class FileInputField extends Component {
       result: "iVBORw0KGgoAAAANSUhEUgAAAhwAAAABCAQAAAA/IL+bAAAAFElEQVR42mN89p9hFIyCUTAKSAIABgMB58aXfLgAAAAASUVORK5CYII=",
     }
 
-    this.props.onChange({ name: '', base64: emptyObject });
+    this.props.onChange({ 
+      name: '', 
+      base64: emptyObject,
+      ts:Date.now() + 1,
+     });
     this.setState({ deleteBtnVisibility: false });
   }
 
@@ -268,7 +288,7 @@ class FileInputField extends Component {
                 <label htmlFor={this.props.name}>{this.props.label}</label>
                 <label className={`ml-15 ${previewClass}`} onClick={this.removeSelectedFile}>{options.CancelFileButton}</label>
                 {
-                  (fileInfo.base64 || '').length > 0 && <label className={`ml-15 ${deleteClass}`} onClick={this.sendEmptyFile}>{options.DeleteFileButton}</label>
+                  (fileInfo.base64 || fileInfo.icon || '').length > 0 && <label className={`ml-15 ${deleteClass}`} onClick={this.sendEmptyFile}>{options.DeleteFileButton}</label>
                 }
                 <input
                   className="fileInput"
@@ -283,7 +303,7 @@ class FileInputField extends Component {
           </Col>
           <Col className="mw-133">
             {
-              (fileInfo.base64 || fileInfo.icon || '').length > 0 && inPlaceImg && fileInfo.base64 !== emptyFile &&
+              (fileInfo.base64 || '').length > 0 && inPlaceImg && fileInfo.base64 !== emptyFile &&
               <div className={`form__form-group truncate pointer ${deleteIconClass}`} onClick={this.previewServerFile(fileContent, mimeType)} src={fileContent || iconContent}>
                 <i className={`fa ${iconClass} fs-38 fill-fintrux`}></i>
                 <p>{fileInfo.fileName}</p>
 
@@ -0,0 +1,61 @@
+import React, { Component } from 'react';
+import log from '../../helpers/logger'
+import CheckIcon from 'mdi-react/CheckIcon';
+export default class ListBox extends Component {
+  constructor(props) {
+    super(props);
+
+    const selectedValue = ((this.props.value || '').replace('(', '').replace(')', '').split(",") || []).filter(o => (o)).reduce((a, o) => { a[o] = true; return a }, {});
+    this.state = {
+      options: (this.props.options || []).filter(o => o.value),
+      selectedValue: selectedValue,
+    }
+  }
+
+  hanldeCheck = (value => {
+    return function (evt) {
+      const curValues = { ...this.state.selectedValue };
+      curValues[value] = !curValues[value];
+
+      if (typeof this.props.onChange === 'function') {
+        this.setState({
+          selectedValue: curValues
+        });
+        const revisedValues = Object.keys(curValues).filter(o => (curValues[o])).map(o => (o)).join(",");
+        this.props.onChange(this.props.name || (this.props.field || {}).name, revisedValues);
+      } else {
+        this.setState({
+          selectedValue: curValues
+        });
+      }
+
+    }.bind(this);
+
+  }).bind(this);
+
+  render() {
+    const optionList = (this.props.options || []).filter(o => o.value);
+    return (
+      <div className='listboxSelection'>
+        {optionList.map((obj, i) => (
+          <div className='form__form-group' key={i}>
+            <label className='checkbox-btn checkbox-btn--colored-click'>
+              <input
+                name={this.props.name + "_" + obj.value}
+                value={obj.value}
+                type="checkbox"
+                listidx={i}
+                keyid={obj.key}
+                className='checkbox-btn__checkbox'
+                disabled={obj.disabled}
+                onClick={this.hanldeCheck(obj.value)}
+                defaultChecked={this.state.selectedValue[obj.value]}
+              />
+              <span className='checkbox-btn__checkbox-custom'><CheckIcon /></span>
+              <span className='checkbox-btn__label'>{obj.label}</span>
+            </label>
+          </div>))}
+      </div>
+    );
+  };
+};
@@ -412,6 +412,18 @@ export default class RintagiScreen extends Component {
     }
   }
 
+  ListBoxChange(setFieldValue, setFieldTouched, forName, formikCurValues, dependents = []) {
+    const _this = this;
+    return function (name, value) {
+      _this.FieldInFocus = name || forName;
+      const val = value && '(' + value + ')';
+      log.debug('List Box Change', val, name, forName)
+      setFieldTouched(name || forName, true);
+      setFieldValue(name || forName, val);
+      dependents.filter(f => typeof f === "function").reduce((formikCurValues, f) => f(val, name || forName, formikCurValues), formikCurValues);
+    }
+  }
+
   TextFocus(event) {
     // log.debug(event);
     // event.target.select();
@@ -482,6 +494,7 @@ export default class RintagiScreen extends Component {
         mimeType: value.mimeType,
         lastModified: value.lastModified,
         base64: value.base64.result,
+        ts:value.ts,
       } : null;
       _this.setState({ filename: (file || {}).fileName });
       setFieldValue(name, file);
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ namespace RO.Common3`
`12`	`12`	`public class Encryption: Key`
`13`	`13`	`{`
`14`	`14`	`private string pExpiryDt = "9999.12.01";`
	`15`	`+ public const string ROVersion = "20200228";`
`15`	`16`	`// RCEncryption uses TripleDES algorithm to encrypt and/or decrypt an input string.`
`16`	`17`	`// By default a key is used to do the decryption, this key should be the same for decryption and encryption.`
`17`	`18`
`@@ -202,7 +203,7 @@ public Tuple<string, bool, string> DecodeLicenseString(string _licenseStringBase`
`202`	`203`	`}`
`203`	`204`
`204`	`205`
`205`		`- public string RenewLicense(string LicenseServerEndPoint)`
	`206`	`+ public string RenewLicense(string LicenseServerEndPoint, string InstallID=null, string AppId = null, string AppNameSpace = null)`
`206`	`207`	`{`
`207`	`208`	`return null;`
`208`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1356,10 +1356,10 @@ public static bool IsFullyLicense(string moduleName, string resourceName)`
`1356`	`1356`	`RO.Common3.Encryption e = new RO.Common3.Encryption();`
`1357`	`1357`	`return e.CheckValidLicense(moduleName, resourceName);`
`1358`	`1358`	`}`
`1359`		`- public static string RenewLicense(string LicenseServerEndPoint = null)`
	`1359`	`+ public static string RenewLicense(string LicenseServerEndPoint = null, string InstallID = null, string AppId = null, string AppNameSpace = null)`
`1360`	`1360`	`{`
`1361`	`1361`	`RO.Common3.Encryption e = new RO.Common3.Encryption();`
`1362`		`- return e.RenewLicense(LicenseServerEndPoint);`
	`1362`	`+ return e.RenewLicense(LicenseServerEndPoint, InstallID, AppId, AppNameSpace);`
`1363`	`1363`	`}`
`1364`	`1364`
`1365`	`1365`	`public static List<DataStructure> AnalyseExcelData(DataTable dtImp, int rowsToExamine)`
`@@ -1437,7 +1437,7 @@ public static List<DataStructure> AnalyseExcelData(DataTable dtImp, int rowsToEx`
`1437`	`1437`	`return (from x in columns where !string.IsNullOrEmpty(x.ColumnName) select x).ToList();`
`1438`	`1438`	`}`
`1439`	`1439`
`1440`		`- public static void DirectoryCleanup(string sourceDirName, string searchPattern, bool recursve = false)`
	`1440`	`+ public static void DirectoryCleanup(string sourceDirName, string searchPattern, bool recursive = false)`
`1441`	`1441`	`{`
`1442`	`1442`	`if (string.IsNullOrEmpty(searchPattern)) return;`
`1443`	`1443`
`@@ -1460,15 +1460,15 @@ public static void DirectoryCleanup(string sourceDirName, string searchPattern,`
`1460`	`1460`	`{ }`
`1461`	`1461`	`}`
`1462`	`1462`
`1463`		`- if (recursve)`
	`1463`	`+ if (recursive)`
`1464`	`1464`	`{`
`1465`	`1465`	`// Get the subdirectories for the specified directory.`
`1466`	`1466`	`try`
`1467`	`1467`	`{`
`1468`	`1468`	`DirectoryInfo[] dirs = dir.GetDirectories();`
`1469`	`1469`	`foreach (DirectoryInfo subdir in dirs)`
`1470`	`1470`	`{`
`1471`		`- DirectoryCleanup(subdir.FullName, searchPattern, recursve);`
	`1471`	`+ DirectoryCleanup(subdir.FullName, searchPattern, recursive);`
`1472`	`1472`	`}`
`1473`	`1473`	`}`
`1474`	`1474`	`catch { }`