Change Password procces

Common/.vs/config/applicationhost.config

@@ -155,7 +155,7 @@
 			</site>
             <site name="MeterProcessState" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:56011:localhost" />

Common/Metrology/Measurements/CalibrationMeasurement.cs

@@ -71,7 +71,7 @@ namespace Xylem.Common.Metrology.Measurements
 
             //for calibration the RefVolumeCm is essential, the refTimeS is needed for flying start/stop
             var measurementResult = GetFinalMeasurementResult(refVolumeCm, refTimeS);
-
+            //todo recalcualted
             //adjust  the calibration scale factor to the required deviation
             return measurementResult.ScaleFactorRefToDut * reqDeviationRel;
         }

Common/ProductionUiCordonel/FinalTest.xaml.cs

@@ -454,13 +454,13 @@ namespace ProductionUiCordonel
             //if (RadioAdress != 0)
             //{
 
-                var radioCheck = new ProductionProcessRadioCheck();
+            var radioCheck = new ProductionProcessRadioCheck();
 
-                orderBarcode.isDone += delegate (object sender, EventArgs e)
+            orderBarcode.isDone += delegate (object sender, EventArgs e)
-                {
+            {
-                    radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
+                radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
-                };
+            };
-                pc.Processes.Add(radioCheck);            //[] [] []
+            pc.Processes.Add(radioCheck);            //[] [] []
             //}
 
             //pc.Processes.Add(new ProductionProcessSpecialConfig());         //[x] [x] []

Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessConnect.cs

@@ -71,6 +71,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
                        var url = $"{ServiceUrls.GenesisFinalCheckServiceUrl()}GetProgrammingParameters?PcbID={base.Meter.PcbId}";
                        var csdRet = LocalWebRequest.GetRequest(url, 80000);
 
+
                        return Newtonsoft.Json.JsonConvert.DeserializeObject<IList<ProgrammingParameters>>(csdRet);
 
                    }

Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessPasswordFile.cs

@@ -58,8 +58,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
 
         public override void StartProcess()
         {
-            base.currentProcessState = ProductionProcessState.Done;
+
-            return;
             bool ret = RequestPassword();
             updateImage(UserControl.RequestPassword, ret);
             base.Progress = base.Progress + 16;
@@ -187,7 +186,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
             var passwordSetServiceUrl = ServiceUrls.GenesisSetPasswordServiceUrl();
 
 
-            var responseJson = LocalWebRequest.GetRequest(passwordSetServiceUrl + Meter.PcbId + "&Password=" + newPs + "&keepOldPw=true", 8000);
+            var responseJson = LocalWebRequest.GetRequest(passwordSetServiceUrl + Meter.PcbId + "&Password=" + newPs , 8000);
             if (responseJson.ToLower().Contains("store"))
             {
                 return true;

Common/Service/MeterProcessState/Controllers/PasswordController.cs

@@ -39,22 +39,16 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
         {
             try
             {
-
+                if (keepOldPw == true)
+                {
+                    throw new ApplicationException("Not Suppoted keepOldPw");
+                }
                 using (var dataAccess = new SqlDataAccess(GlobalConfig.connectionString.Value))
                 {
                     StringBuilder sb = new StringBuilder();
-                    if (keepOldPw)
-                    {
-                        sb.AppendLine(
-                            $"update auftrag.dbo.Genesis_PcbPassword set KitronSkeletonKey  = [password] , [password] ='{password}'  where PcbId='{PcbId}'");
-                    }
-                    else
-                    {
-                        sb.AppendLine(
-                            $"Insert into dbo.Genesis_PcbPassword(PcbId, [password]) values('{PcbId}', '{password}')");
-
-                    }
 
+                    sb.AppendLine($"update auftrag.dbo.Genesis_PcbPassword set [password] ='{password}'  where PcbId='{PcbId}'");
+       
 
                     var dt = dataAccess.ExecuteQuery(sb.ToString());
                 }

Common/Ui/LegacyGenesisControl/ctlBatch.cs

@@ -1956,7 +1956,7 @@ namespace XylemCommonUiLegacyGenCtl
                             try
                             {
                                 var genesis = (GenesisMeter)baseMeter;
-                                genesis.QuickLogin();
+                                genesis.ReLogin();
                                 genesis.BuildAndCheckCalibFactorsAllChannels(StoreRefVolume, StoreTestTimeRef, calFactor);
 
                                 //genesis.SetCalibFactorsAllChannels(true);