diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs index 4662e98f..72706858 100644 --- a/ENI2/Excel/DakosyUtil.cs +++ b/ENI2/Excel/DakosyUtil.cs @@ -149,7 +149,37 @@ namespace ENI2.Excel wasr.PortReceptionFacilityProviderName = reader.ReadCellAsText("waste delivery receipt", string.Format("D{0}", i + 9)); wasr.WasteDeliveryDateFrom = reader.ReadCellAsDateTime("waste delivery receipt", string.Format("E{0}", i + 9)); wasr.WasteDeliveryDateTo = reader.ReadCellAsDateTime("waste delivery receipt", string.Format("F{0}", i + 9)); - + + // now for the love of god this ist so stupid but I have no better way + ReadWasteReceived(wasr, "101", string.Format("G{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "102", string.Format("H{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "103", string.Format("I{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "104", string.Format("J{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "105", string.Format("K{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "201", string.Format("L{0}", i + 9), string.Format("M{0}", i + 9) , reader); + ReadWasteReceived(wasr, "202", string.Format("N{0}", i + 9), string.Format("O{0}", i + 9), reader); + ReadWasteReceived(wasr, "203", string.Format("P{0}", i + 9), string.Format("Q{0}", i + 9), reader); + ReadWasteReceived(wasr, "204", string.Format("R{0}", i + 9), string.Format("S{0}", i + 9), reader); + ReadWasteReceived(wasr, "401", string.Format("T{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "501", string.Format("U{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "502", string.Format("V{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "503", string.Format("W{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "504", string.Format("X{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "505", string.Format("Y{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "506", string.Format("Z{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "507", string.Format("AA{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "508", string.Format("AB{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "509", string.Format("AC{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "510", string.Format("AD{0}", i + 9), string.Format("AE{0}", i + 9), reader); + ReadWasteReceived(wasr, "511", string.Format("AF{0}", i + 9), string.Format("AG{0}", i + 9), reader); + ReadWasteReceived(wasr, "601", string.Format("AH{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "602", string.Format("AI{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "991", string.Format("AJ{0}", i + 9), null, reader); + ReadWasteReceived(wasr, "999", string.Format("AK{0}", i + 9), string.Format("AL{0}", i + 9), reader); + + ReadTreatmentFacility(wasr, string.Format("AM{0}", i + 9), reader); + ReadTreatmentFacility(wasr, string.Format("AN{0}", i + 9), reader); + ReadTreatmentFacility(wasr, string.Format("AO{0}", i + 9), reader); result = true; } @@ -157,6 +187,37 @@ namespace ENI2.Excel return result; } + private static void ReadWasteReceived(WAS_RCPT was_rcpt, string wasteCode, string amountCell, string descriptionCell, ExcelReader reader) + { + double? amount = reader.ReadCellAsDecimal("waste delivery receipt", amountCell); + if (amount.HasValue) + { + WasteReceived wr = new WasteReceived(); + wr.Identifier = (was_rcpt.WasteReceived.Count + 1).ToString(); + wr.WAS_RCPT = was_rcpt; + was_rcpt.WasteReceived.Add(wr); + wr.WasteCode = wasteCode; + wr.AmountWasteReceived_MTQ = amount; + if(!descriptionCell.IsNullOrEmpty()) + { + wr.WasteDescription = reader.ReadCellAsText("waste delivery receipt", descriptionCell); + } + } + } + + private static void ReadTreatmentFacility(WAS_RCPT was_rcpt, string facCell, ExcelReader reader) + { + string tfpText = reader.ReadCellAsText("waste delivery receipt", facCell); + if(!tfpText.IsNullOrEmpty()) + { + TreatmentFacilityProvider tfp = new TreatmentFacilityProvider(); + tfp.Identifier = (was_rcpt.TreatmentFacilityProvider.Count + 1).ToString(); + tfp.WAS_RCPT = was_rcpt; + tfp.TreatmentFacilityProviderName = tfpText; + was_rcpt.TreatmentFacilityProvider.Add(tfp); + } + } + #endregion #region WAS