updaet 20250123

This commit is contained in:
Stefan Hutter
2025-01-24 16:25:47 +01:00
parent 52a3fecee5
commit 608c67d21b
156 changed files with 2055 additions and 1660 deletions

View File

@@ -68,6 +68,8 @@ namespace OnDoc.UIControls
public bool FillOffice = false;
public string CompatibilityMode = "";
public string dokumentid { get; set; } = "";
public UCAllgemeineDokumentParam()
{
@@ -263,7 +265,7 @@ namespace OnDoc.UIControls
{
}
Logging.Logging.Debug("Profilnr", "OnDOc", profilnr.ToString());
Logging.Logging.Debug("Profilnr", "OnDoc", profilnr.ToString());
if (profilnr != 0)
{
@@ -290,8 +292,26 @@ namespace OnDoc.UIControls
}
}
if (dokumentid == "")
{
Get_DokWertList(ref db, "", 1);
}
db = null;
Refresh_Team();
try
{
this.cbboxteam.SelectedIndex = 0;
}
catch { }
}
private void Get_DokWertList(ref DB db, string dokumentid, int createnew)
{
System.Data.DataTable dokwertlist = new System.Data.DataTable();
dokwertlist = db.Get_DokumentWertList("", dokumenttypnr);
dokwertlist = db.Get_DokumentWertList(dokumentid, dokumenttypnr, createnew);
if (EDK_Data.toexecute == true)
{
//db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where tgnummer='" + EDK_Data.verantwortlich + "'", false, true);
@@ -307,7 +327,7 @@ namespace OnDoc.UIControls
}
dokwertlist.AcceptChanges();
}
gridDokwertlist.DataSource = dokwertlist;
for (int i = 3; i < gridDokwertlist.Columns.Count; i++)
@@ -322,17 +342,10 @@ namespace OnDoc.UIControls
gridDokwertlist.Columns.Add(new GridImageColumn() { MappingName = "S", ImageLayout = ImageLayout.Center });
gridDokwertlist.Columns["S"].Width = 25;
gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle;
gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType=Syncfusion.Data.FilterType.Equals,FilterValue=true });
gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType = Syncfusion.Data.FilterType.Equals, FilterValue = true });
gridDokwertlist.View.RecordPropertyChanged += OnRecordPropertyChanged;
db = null;
Refresh_Team();
try
{
this.cbboxteam.SelectedIndex = 0;
}
catch { }
}
private void OnRecordPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -626,6 +639,8 @@ namespace OnDoc.UIControls
if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable;
}
@@ -691,6 +706,42 @@ namespace OnDoc.UIControls
dokdata.anrede = docgendata.anrede;
dokdata.barcode_zusatz = barcode_zusatz;
if (cbfaksimile.Checked)
{
dokdata.approval1 = 0;
dokdata.approval2 = 0;
try
{
if (cbboxunterschriftlinks.Text == "") { dokdata.approval1 = 1; }
else
{
if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftlinks.SelectedValue.ToString()))
{
dokdata.approval1 = 1;
}
}
}
catch { }
try
{
if (cbboxunterschriftrechts.Text == "") { dokdata.approval2 = 1; }
else
{
if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftrechts.SelectedValue.ToString()))
{
dokdata.approval2 = 1;
}
}
}
catch { }
if (dokdata.approval1 == 1 && dokdata.approval2 == 1 )
{
dokdata.approved = 1;
}
}
}
private void sfButton1_Click(object sender, EventArgs e)
{
@@ -936,7 +987,6 @@ namespace OnDoc.UIControls
{
}
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
@@ -958,6 +1008,44 @@ namespace OnDoc.UIControls
catch { }
}
public void load_doc()
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid='" + this.dokumentid+"'", false, true);
System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0];
this.partnernr = Convert.ToInt32(dr["nrpar00"]);
this.dokumenttypnr = Convert.ToInt32(dr["dokumenttypnr"]);
Refresh_Details();
this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]);
this.cbboxunterschriftlinks.SelectedValue= Convert.ToInt32(dr["unterschriftlinks"]);
this.cbboxunterschriftrechts.SelectedValue = Convert.ToInt32(dr["unterschriftrechts"]);
if (Convert.ToInt32(dr["zustaendig_kube"]) > 0)
{
rbzustaendigkube.Checked = true;
rbzustaendigmitarbeiter.Checked = false;
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendig_kube"]);
} else
{
rbzustaendigmitarbeiter.Checked = true;
rbzustaendigkube.Checked = false;
cbboxzustaendigmitarbeiter.SelectedValue = Convert.ToInt32(dr["zustaendiger"]);
}
this.txtbezeichnung.Text = dr["bezeichnung"].ToString();
this.cbboxverantwortlich.SelectedValue = Convert.ToInt32(dr["verantwortlich"]);
this.txtanrede.Text = dr["anredezustelladresse"].ToString();
this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]);
this.DateDokumentDatum.Value = Convert.ToDateTime(dr["erstellungsdatum"]);
this.DateTerminText.Text = Convert.ToDateTime(dr["termin"]).ToString();
if (dr["zustelladresse"].ToString() != "") this.txtPartnerZusteller.Text = dr["zustelladresse"].ToString();
Get_DokWertList(ref db, dokumentid, 0);
db = null;
}
}
}