Merge branch 'ENV-DEV' into 'ENV-STAGING'

update download

See merge request !2076

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2520,7 +2520,8 @@ export default class BudgetTahunan extends Component {
             "report_id": selectReport,
             "month": "",
             "quartal": "",
-            "type_report_name": "Master Budget"
+            "type_report_name": "Master Budget",
+            "currency_id" : defaultCurrency.id
         }
         // console.log(payload);
         api.create().createDownloadFile(payload).then((response) => {

src/container/MasterData/Parameter/CreateParameter.js

@@ -867,10 +867,10 @@ export default class CreateParameter extends Component {
                 } else if (this.state.getTypes.setting_group_name == "THRESHOLD_VARIANCE" || this.state.getTypes.setting_group_name == "THRESHOLD_CONTROL") {
                     if (R.isEmpty(data.minValue)) {
                     } else {
-                        if (data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0, 1) != "0" && data.minValue.length <= minMaxValidasi.minLength) {
+                        if (data.minValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.minValue.substring(0,1) != "0" : true )  && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.minValue.length <= minMaxValidasi.minLength : true )) {
                             if (R.isEmpty(data.maxValue)) {
                             } else {
-                                if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0, 1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
+                                if (data.maxValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.maxValue.substring(0,1) != "0" : true ) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.maxValue.length <= minMaxValidasi.maxLength : true )) {
                                     this.updateParameter()
                                 }
                             }
@@ -1104,10 +1104,10 @@ export default class CreateParameter extends Component {
                     })
                     break
                 case "THRESHOLD_CONTROL":
-                    this.setState({ errorMinValue: true, msgErrorMinValue: 'Incorrect min value format, example : 99999999' })
+                    this.setState({ errorMinValue: true, msgErrorMinValue: 'Incorrect min value format, example : -99999999' })
                     break
                 case "THRESHOLD_VARIANCE":
-                    this.setState({ errorMinValue: true, msgErrorMinValue: 'Incorrect min value format, example : 99999999' })
+                    this.setState({ errorMinValue: true, msgErrorMinValue: 'Incorrect min value format, example : -99999999' })
                     break
                 default:
                     this.setState({ errorMinValue: false, msgErrorMinValue: '' })
@@ -1191,7 +1191,7 @@ export default class CreateParameter extends Component {
                     }
                     break
                 case "THRESHOLD_CONTROL":
-                    obj = { minMaxRegex: (/-?\d+(\.?\d+)?$/), minLength: this.state.minValue.length, maxLength: this.state.maxValue.length }
+                    obj = { minMaxRegex: (/^-?\d+(\.\d+)?$/), minLength: this.state.minValue.length, maxLength: this.state.maxValue.length }
                     break
                 default:
                     obj = { regexValue: null, minLength: 11, maxLength: 11 }
@@ -1211,9 +1211,6 @@ export default class CreateParameter extends Component {
     }
 
     validasiCurrencyTC(){
-        console.log(this.state.getThresholdCurrency)
-        console.log(this.state.errorThresholdCurrency)
-        console.log(this.state.msgErrorThresholdCurrency)
         if (R.isNil(this.state.getThresholdCurrency)){
             this.setState({ errorThresholdCurrency: true, msgErrorThresholdCurrency: 'Currency Cannot be Empty' })
         }
@@ -1234,7 +1231,7 @@ export default class CreateParameter extends Component {
                     this.validasiCurrencyTC()
                 }
             }else {
-                if (data.maxValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.maxValue.substring(0,1) != "0" : true ) && data.maxValue.length <= minMaxValidasi.maxLength) {
+                if (data.maxValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.maxValue.substring(0,1) != "0" : true ) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.maxValue.length <= minMaxValidasi.maxLength : true ) ) {
                     this.validasiCurrencyTC()
                 } else {
                     this.validasiMaxResponse()
@@ -1268,7 +1265,7 @@ export default class CreateParameter extends Component {
                     this.validasiFormatData()
                 }
             }else {
-                if(data.minValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.minValue.substring(0,1) != "0" : true )  && data.minValue.length <= minMaxValidasi.minLength){
+                if(data.minValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.minValue.substring(0,1) != "0" : true )  && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.minValue.length <= minMaxValidasi.minLength : true )){
                     this.validasiFormatData()
                 } else {
                     this.validasiMinResponse()

src/container/MonthlyReport/MonthlyReport.js

@@ -2311,7 +2311,8 @@ export default class MonthlyReport extends Component {
             "report_id": selectReport,
             "month": month ? String(month.month_id).toString() : "",
             "quartal": "",
-            "type_report_name": "Monthly Report"
+            "type_report_name": "Monthly Report",
+            "currency_id" : defaultCurrency.id
         }
         console.log(payload);
         api.create().createDownloadFile(payload).then((response) => {

src/container/OperatingIndicator/OperatingIndicator.js

@@ -658,7 +658,8 @@ export default class OperatingIndicator extends Component {
             "report_id": selectReport,
             "month": "",
             "quartal": "",
-            "type_report_name": "Operating Indicator"
+            "type_report_name": "Operating Indicator",
+            "currency_id" : defaultCurrency.id
         }
         console.log(payload);
         api.create().createDownloadFile(payload).then((response) => {

src/container/OutlookPA/OutlookPA.js

@@ -1545,7 +1545,8 @@ export default class OutlookPA extends Component {
             "report_id": selectReport,
             "month": "",
             "quartal": "",
-            "type_report_name": "Outlook PA"
+            "type_report_name": "Outlook PA",
+            "currency_id" : defaultCurrency.id
         }
         console.log(payload);
         api.create().createDownloadFile(payload).then((response) => {

src/container/RollingOutlook/RollingOutlook.js

@@ -1560,7 +1560,8 @@ export default class RollingOutlook extends Component {
             "report_id": selectReport,
             "month": "",
             "quartal": quarter ? quarter.value : "",
-            "type_report_name": "Rolling Outlook"
+            "type_report_name": "Rolling Outlook",
+            "currency_id" : defaultCurrency.id
         }
         console.log(payload);
         api.create().createDownloadFile(payload).then((response) => {