diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj
index 66dbcb9..75d1254 100644
--- a/AppData/AppData.csproj
+++ b/AppData/AppData.csproj
@@ -40,13 +40,17 @@
MinimumRecommendedRules.ruleset
-
- False
- ExtLib\ReportingServices_SQL2008_v10\Microsoft.ReportViewer.Common.dll
+
+ ..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.Common.dll
-
- False
- ExtLib\ReportingServices_SQL2008_v10\Microsoft.ReportViewer.WinForms.dll
+
+ ..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.DataVisualization.dll
+
+
+ ..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.ProcessingObjectModel.dll
+
+
+ ..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
@@ -89,6 +93,7 @@
..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
+
@@ -151,15 +156,5 @@
Settings.Designer.cs
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/AppData/DS_Report.Designer.cs b/AppData/DS_Report.Designer.cs
index 8b51ced..1d78b4b 100644
--- a/AppData/DS_Report.Designer.cs
+++ b/AppData/DS_Report.Designer.cs
@@ -24,7 +24,7 @@ namespace AppData {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")]
public partial class DS_Report : global::System.Data.DataSet {
- private prt_StackLabelDataTable tableprt_StackLabel;
+ private stp_prt_StackLabelDataTable tablestp_prt_StackLabel;
private PrintJobQueueDataTable tablePrintJobQueue;
@@ -56,8 +56,8 @@ namespace AppData {
if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
global::System.Data.DataSet ds = new global::System.Data.DataSet();
ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
- if ((ds.Tables["prt_StackLabel"] != null)) {
- base.Tables.Add(new prt_StackLabelDataTable(ds.Tables["prt_StackLabel"]));
+ if ((ds.Tables["stp_prt_StackLabel"] != null)) {
+ base.Tables.Add(new stp_prt_StackLabelDataTable(ds.Tables["stp_prt_StackLabel"]));
}
if ((ds.Tables["PrintJobQueue"] != null)) {
base.Tables.Add(new PrintJobQueueDataTable(ds.Tables["PrintJobQueue"]));
@@ -84,9 +84,9 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
[global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
- public prt_StackLabelDataTable prt_StackLabel {
+ public stp_prt_StackLabelDataTable stp_prt_StackLabel {
get {
- return this.tableprt_StackLabel;
+ return this.tablestp_prt_StackLabel;
}
}
@@ -167,8 +167,8 @@ namespace AppData {
this.Reset();
global::System.Data.DataSet ds = new global::System.Data.DataSet();
ds.ReadXml(reader);
- if ((ds.Tables["prt_StackLabel"] != null)) {
- base.Tables.Add(new prt_StackLabelDataTable(ds.Tables["prt_StackLabel"]));
+ if ((ds.Tables["stp_prt_StackLabel"] != null)) {
+ base.Tables.Add(new stp_prt_StackLabelDataTable(ds.Tables["stp_prt_StackLabel"]));
}
if ((ds.Tables["PrintJobQueue"] != null)) {
base.Tables.Add(new PrintJobQueueDataTable(ds.Tables["PrintJobQueue"]));
@@ -206,10 +206,10 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
internal void InitVars(bool initTable) {
- this.tableprt_StackLabel = ((prt_StackLabelDataTable)(base.Tables["prt_StackLabel"]));
+ this.tablestp_prt_StackLabel = ((stp_prt_StackLabelDataTable)(base.Tables["stp_prt_StackLabel"]));
if ((initTable == true)) {
- if ((this.tableprt_StackLabel != null)) {
- this.tableprt_StackLabel.InitVars();
+ if ((this.tablestp_prt_StackLabel != null)) {
+ this.tablestp_prt_StackLabel.InitVars();
}
}
this.tablePrintJobQueue = ((PrintJobQueueDataTable)(base.Tables["PrintJobQueue"]));
@@ -228,15 +228,15 @@ namespace AppData {
this.Namespace = "http://tempuri.org/DS_Report.xsd";
this.EnforceConstraints = true;
this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
- this.tableprt_StackLabel = new prt_StackLabelDataTable();
- base.Tables.Add(this.tableprt_StackLabel);
+ this.tablestp_prt_StackLabel = new stp_prt_StackLabelDataTable();
+ base.Tables.Add(this.tablestp_prt_StackLabel);
this.tablePrintJobQueue = new PrintJobQueueDataTable();
base.Tables.Add(this.tablePrintJobQueue);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- private bool ShouldSerializeprt_StackLabel() {
+ private bool ShouldSerializestp_prt_StackLabel() {
return false;
}
@@ -302,7 +302,7 @@ namespace AppData {
}
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public delegate void prt_StackLabelRowChangeEventHandler(object sender, prt_StackLabelRowChangeEvent e);
+ public delegate void stp_prt_StackLabelRowChangeEventHandler(object sender, stp_prt_StackLabelRowChangeEvent e);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public delegate void PrintJobQueueRowChangeEventHandler(object sender, PrintJobQueueRowChangeEvent e);
@@ -312,7 +312,7 @@ namespace AppData {
///
[global::System.Serializable()]
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
- public partial class prt_StackLabelDataTable : global::System.Data.TypedTableBase {
+ public partial class stp_prt_StackLabelDataTable : global::System.Data.TypedTableBase {
private global::System.Data.DataColumn columnSheetID;
@@ -336,8 +336,8 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelDataTable() {
- this.TableName = "prt_StackLabel";
+ public stp_prt_StackLabelDataTable() {
+ this.TableName = "stp_prt_StackLabel";
this.BeginInit();
this.InitClass();
this.EndInit();
@@ -345,7 +345,7 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- internal prt_StackLabelDataTable(global::System.Data.DataTable table) {
+ internal stp_prt_StackLabelDataTable(global::System.Data.DataTable table) {
this.TableName = table.TableName;
if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
this.CaseSensitive = table.CaseSensitive;
@@ -362,7 +362,7 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- protected prt_StackLabelDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) :
+ protected stp_prt_StackLabelDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) :
base(info, context) {
this.InitVars();
}
@@ -458,34 +458,34 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelRow this[int index] {
+ public stp_prt_StackLabelRow this[int index] {
get {
- return ((prt_StackLabelRow)(this.Rows[index]));
+ return ((stp_prt_StackLabelRow)(this.Rows[index]));
}
}
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public event prt_StackLabelRowChangeEventHandler prt_StackLabelRowChanging;
+ public event stp_prt_StackLabelRowChangeEventHandler stp_prt_StackLabelRowChanging;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public event prt_StackLabelRowChangeEventHandler prt_StackLabelRowChanged;
+ public event stp_prt_StackLabelRowChangeEventHandler stp_prt_StackLabelRowChanged;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public event prt_StackLabelRowChangeEventHandler prt_StackLabelRowDeleting;
+ public event stp_prt_StackLabelRowChangeEventHandler stp_prt_StackLabelRowDeleting;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public event prt_StackLabelRowChangeEventHandler prt_StackLabelRowDeleted;
+ public event stp_prt_StackLabelRowChangeEventHandler stp_prt_StackLabelRowDeleted;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public void Addprt_StackLabelRow(prt_StackLabelRow row) {
+ public void Addstp_prt_StackLabelRow(stp_prt_StackLabelRow row) {
this.Rows.Add(row);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelRow Addprt_StackLabelRow(int SheetID, int StackID, int StackIndex, int SheetIndex, int MatID, int MatExtCode, string MatDesc, string StackDtmx, System.DateTime Prepared, System.DateTime DueDate) {
- prt_StackLabelRow rowprt_StackLabelRow = ((prt_StackLabelRow)(this.NewRow()));
+ public stp_prt_StackLabelRow Addstp_prt_StackLabelRow(int SheetID, int StackID, int StackIndex, int SheetIndex, int MatID, int MatExtCode, string MatDesc, string StackDtmx, System.DateTime Prepared, System.DateTime DueDate) {
+ stp_prt_StackLabelRow rowstp_prt_StackLabelRow = ((stp_prt_StackLabelRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
SheetID,
StackID,
@@ -497,22 +497,22 @@ namespace AppData {
StackDtmx,
Prepared,
DueDate};
- rowprt_StackLabelRow.ItemArray = columnValuesArray;
- this.Rows.Add(rowprt_StackLabelRow);
- return rowprt_StackLabelRow;
+ rowstp_prt_StackLabelRow.ItemArray = columnValuesArray;
+ this.Rows.Add(rowstp_prt_StackLabelRow);
+ return rowstp_prt_StackLabelRow;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelRow FindBySheetID(int SheetID) {
- return ((prt_StackLabelRow)(this.Rows.Find(new object[] {
+ public stp_prt_StackLabelRow FindBySheetID(int SheetID) {
+ return ((stp_prt_StackLabelRow)(this.Rows.Find(new object[] {
SheetID})));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public override global::System.Data.DataTable Clone() {
- prt_StackLabelDataTable cln = ((prt_StackLabelDataTable)(base.Clone()));
+ stp_prt_StackLabelDataTable cln = ((stp_prt_StackLabelDataTable)(base.Clone()));
cln.InitVars();
return cln;
}
@@ -520,7 +520,7 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override global::System.Data.DataTable CreateInstance() {
- return new prt_StackLabelDataTable();
+ return new stp_prt_StackLabelDataTable();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -579,28 +579,28 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelRow Newprt_StackLabelRow() {
- return ((prt_StackLabelRow)(this.NewRow()));
+ public stp_prt_StackLabelRow Newstp_prt_StackLabelRow() {
+ return ((stp_prt_StackLabelRow)(this.NewRow()));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
- return new prt_StackLabelRow(builder);
+ return new stp_prt_StackLabelRow(builder);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override global::System.Type GetRowType() {
- return typeof(prt_StackLabelRow);
+ return typeof(stp_prt_StackLabelRow);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowChanged(e);
- if ((this.prt_StackLabelRowChanged != null)) {
- this.prt_StackLabelRowChanged(this, new prt_StackLabelRowChangeEvent(((prt_StackLabelRow)(e.Row)), e.Action));
+ if ((this.stp_prt_StackLabelRowChanged != null)) {
+ this.stp_prt_StackLabelRowChanged(this, new stp_prt_StackLabelRowChangeEvent(((stp_prt_StackLabelRow)(e.Row)), e.Action));
}
}
@@ -608,8 +608,8 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowChanging(e);
- if ((this.prt_StackLabelRowChanging != null)) {
- this.prt_StackLabelRowChanging(this, new prt_StackLabelRowChangeEvent(((prt_StackLabelRow)(e.Row)), e.Action));
+ if ((this.stp_prt_StackLabelRowChanging != null)) {
+ this.stp_prt_StackLabelRowChanging(this, new stp_prt_StackLabelRowChangeEvent(((stp_prt_StackLabelRow)(e.Row)), e.Action));
}
}
@@ -617,8 +617,8 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowDeleted(e);
- if ((this.prt_StackLabelRowDeleted != null)) {
- this.prt_StackLabelRowDeleted(this, new prt_StackLabelRowChangeEvent(((prt_StackLabelRow)(e.Row)), e.Action));
+ if ((this.stp_prt_StackLabelRowDeleted != null)) {
+ this.stp_prt_StackLabelRowDeleted(this, new stp_prt_StackLabelRowChangeEvent(((stp_prt_StackLabelRow)(e.Row)), e.Action));
}
}
@@ -626,14 +626,14 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowDeleting(e);
- if ((this.prt_StackLabelRowDeleting != null)) {
- this.prt_StackLabelRowDeleting(this, new prt_StackLabelRowChangeEvent(((prt_StackLabelRow)(e.Row)), e.Action));
+ if ((this.stp_prt_StackLabelRowDeleting != null)) {
+ this.stp_prt_StackLabelRowDeleting(this, new stp_prt_StackLabelRowChangeEvent(((stp_prt_StackLabelRow)(e.Row)), e.Action));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public void Removeprt_StackLabelRow(prt_StackLabelRow row) {
+ public void Removestp_prt_StackLabelRow(stp_prt_StackLabelRow row) {
this.Rows.Remove(row);
}
@@ -660,7 +660,7 @@ namespace AppData {
type.Attributes.Add(attribute1);
global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
attribute2.Name = "tableTypeName";
- attribute2.FixedValue = "prt_StackLabelDataTable";
+ attribute2.FixedValue = "stp_prt_StackLabelDataTable";
type.Attributes.Add(attribute2);
type.Particle = sequence;
global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
@@ -1072,25 +1072,25 @@ namespace AppData {
///
///Represents strongly named DataRow class.
///
- public partial class prt_StackLabelRow : global::System.Data.DataRow {
+ public partial class stp_prt_StackLabelRow : global::System.Data.DataRow {
- private prt_StackLabelDataTable tableprt_StackLabel;
+ private stp_prt_StackLabelDataTable tablestp_prt_StackLabel;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- internal prt_StackLabelRow(global::System.Data.DataRowBuilder rb) :
+ internal stp_prt_StackLabelRow(global::System.Data.DataRowBuilder rb) :
base(rb) {
- this.tableprt_StackLabel = ((prt_StackLabelDataTable)(this.Table));
+ this.tablestp_prt_StackLabel = ((stp_prt_StackLabelDataTable)(this.Table));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int SheetID {
get {
- return ((int)(this[this.tableprt_StackLabel.SheetIDColumn]));
+ return ((int)(this[this.tablestp_prt_StackLabel.SheetIDColumn]));
}
set {
- this[this.tableprt_StackLabel.SheetIDColumn] = value;
+ this[this.tablestp_prt_StackLabel.SheetIDColumn] = value;
}
}
@@ -1098,10 +1098,10 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int StackID {
get {
- return ((int)(this[this.tableprt_StackLabel.StackIDColumn]));
+ return ((int)(this[this.tablestp_prt_StackLabel.StackIDColumn]));
}
set {
- this[this.tableprt_StackLabel.StackIDColumn] = value;
+ this[this.tablestp_prt_StackLabel.StackIDColumn] = value;
}
}
@@ -1109,10 +1109,10 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int StackIndex {
get {
- return ((int)(this[this.tableprt_StackLabel.StackIndexColumn]));
+ return ((int)(this[this.tablestp_prt_StackLabel.StackIndexColumn]));
}
set {
- this[this.tableprt_StackLabel.StackIndexColumn] = value;
+ this[this.tablestp_prt_StackLabel.StackIndexColumn] = value;
}
}
@@ -1120,10 +1120,10 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int SheetIndex {
get {
- return ((int)(this[this.tableprt_StackLabel.SheetIndexColumn]));
+ return ((int)(this[this.tablestp_prt_StackLabel.SheetIndexColumn]));
}
set {
- this[this.tableprt_StackLabel.SheetIndexColumn] = value;
+ this[this.tablestp_prt_StackLabel.SheetIndexColumn] = value;
}
}
@@ -1131,10 +1131,10 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int MatID {
get {
- return ((int)(this[this.tableprt_StackLabel.MatIDColumn]));
+ return ((int)(this[this.tablestp_prt_StackLabel.MatIDColumn]));
}
set {
- this[this.tableprt_StackLabel.MatIDColumn] = value;
+ this[this.tablestp_prt_StackLabel.MatIDColumn] = value;
}
}
@@ -1142,10 +1142,10 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int MatExtCode {
get {
- return ((int)(this[this.tableprt_StackLabel.MatExtCodeColumn]));
+ return ((int)(this[this.tablestp_prt_StackLabel.MatExtCodeColumn]));
}
set {
- this[this.tableprt_StackLabel.MatExtCodeColumn] = value;
+ this[this.tablestp_prt_StackLabel.MatExtCodeColumn] = value;
}
}
@@ -1153,10 +1153,10 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string MatDesc {
get {
- return ((string)(this[this.tableprt_StackLabel.MatDescColumn]));
+ return ((string)(this[this.tablestp_prt_StackLabel.MatDescColumn]));
}
set {
- this[this.tableprt_StackLabel.MatDescColumn] = value;
+ this[this.tablestp_prt_StackLabel.MatDescColumn] = value;
}
}
@@ -1165,14 +1165,14 @@ namespace AppData {
public string StackDtmx {
get {
try {
- return ((string)(this[this.tableprt_StackLabel.StackDtmxColumn]));
+ return ((string)(this[this.tablestp_prt_StackLabel.StackDtmxColumn]));
}
catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("Il valore della colonna \'StackDtmx\' nella tabella \'prt_StackLabel\' è DBNull.", e);
+ throw new global::System.Data.StrongTypingException("Il valore della colonna \'StackDtmx\' nella tabella \'stp_prt_StackLabel\' è DBNull.", e);
}
}
set {
- this[this.tableprt_StackLabel.StackDtmxColumn] = value;
+ this[this.tablestp_prt_StackLabel.StackDtmxColumn] = value;
}
}
@@ -1181,14 +1181,14 @@ namespace AppData {
public System.DateTime Prepared {
get {
try {
- return ((global::System.DateTime)(this[this.tableprt_StackLabel.PreparedColumn]));
+ return ((global::System.DateTime)(this[this.tablestp_prt_StackLabel.PreparedColumn]));
}
catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("Il valore della colonna \'Prepared\' nella tabella \'prt_StackLabel\' è DBNull.", e);
+ throw new global::System.Data.StrongTypingException("Il valore della colonna \'Prepared\' nella tabella \'stp_prt_StackLabel\' è DBNull.", e);
}
}
set {
- this[this.tableprt_StackLabel.PreparedColumn] = value;
+ this[this.tablestp_prt_StackLabel.PreparedColumn] = value;
}
}
@@ -1196,35 +1196,35 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public System.DateTime DueDate {
get {
- return ((global::System.DateTime)(this[this.tableprt_StackLabel.DueDateColumn]));
+ return ((global::System.DateTime)(this[this.tablestp_prt_StackLabel.DueDateColumn]));
}
set {
- this[this.tableprt_StackLabel.DueDateColumn] = value;
+ this[this.tablestp_prt_StackLabel.DueDateColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsStackDtmxNull() {
- return this.IsNull(this.tableprt_StackLabel.StackDtmxColumn);
+ return this.IsNull(this.tablestp_prt_StackLabel.StackDtmxColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetStackDtmxNull() {
- this[this.tableprt_StackLabel.StackDtmxColumn] = global::System.Convert.DBNull;
+ this[this.tablestp_prt_StackLabel.StackDtmxColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPreparedNull() {
- return this.IsNull(this.tableprt_StackLabel.PreparedColumn);
+ return this.IsNull(this.tablestp_prt_StackLabel.PreparedColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPreparedNull() {
- this[this.tableprt_StackLabel.PreparedColumn] = global::System.Convert.DBNull;
+ this[this.tablestp_prt_StackLabel.PreparedColumn] = global::System.Convert.DBNull;
}
}
@@ -1369,22 +1369,22 @@ namespace AppData {
///Row event argument class
///
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public class prt_StackLabelRowChangeEvent : global::System.EventArgs {
+ public class stp_prt_StackLabelRowChangeEvent : global::System.EventArgs {
- private prt_StackLabelRow eventRow;
+ private stp_prt_StackLabelRow eventRow;
private global::System.Data.DataRowAction eventAction;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelRowChangeEvent(prt_StackLabelRow row, global::System.Data.DataRowAction action) {
+ public stp_prt_StackLabelRowChangeEvent(stp_prt_StackLabelRow row, global::System.Data.DataRowAction action) {
this.eventRow = row;
this.eventAction = action;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelRow Row {
+ public stp_prt_StackLabelRow Row {
get {
return this.eventRow;
}
@@ -1446,7 +1446,7 @@ namespace AppData.DS_ReportTableAdapters {
[global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public partial class prt_StackLabelTableAdapter : global::System.ComponentModel.Component {
+ public partial class stp_prt_StackLabelTableAdapter : global::System.ComponentModel.Component {
private global::System.Data.SqlClient.SqlDataAdapter _adapter;
@@ -1460,7 +1460,7 @@ namespace AppData.DS_ReportTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public prt_StackLabelTableAdapter() {
+ public stp_prt_StackLabelTableAdapter() {
this.ClearBeforeFill = true;
}
@@ -1557,7 +1557,7 @@ namespace AppData.DS_ReportTableAdapters {
this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
tableMapping.SourceTable = "Table";
- tableMapping.DataSetTable = "prt_StackLabel";
+ tableMapping.DataSetTable = "stp_prt_StackLabel";
tableMapping.ColumnMappings.Add("SheetID", "SheetID");
tableMapping.ColumnMappings.Add("StackID", "StackID");
tableMapping.ColumnMappings.Add("StackIndex", "StackIndex");
@@ -1594,7 +1594,7 @@ namespace AppData.DS_ReportTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
- public virtual int Fill(DS_Report.prt_StackLabelDataTable dataTable, global::System.Nullable StackID) {
+ public virtual int Fill(DS_Report.stp_prt_StackLabelDataTable dataTable, global::System.Nullable StackID) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((StackID.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(StackID.Value));
@@ -1613,7 +1613,7 @@ namespace AppData.DS_ReportTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
- public virtual DS_Report.prt_StackLabelDataTable GetData(global::System.Nullable StackID) {
+ public virtual DS_Report.stp_prt_StackLabelDataTable GetData(global::System.Nullable StackID) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((StackID.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(StackID.Value));
@@ -1621,7 +1621,7 @@ namespace AppData.DS_ReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
- DS_Report.prt_StackLabelDataTable dataTable = new DS_Report.prt_StackLabelDataTable();
+ DS_Report.stp_prt_StackLabelDataTable dataTable = new DS_Report.stp_prt_StackLabelDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
diff --git a/AppData/DS_Report.xsd b/AppData/DS_Report.xsd
index 6ec9fce..ceccc24 100644
--- a/AppData/DS_Report.xsd
+++ b/AppData/DS_Report.xsd
@@ -7,7 +7,7 @@
-
+
@@ -193,7 +193,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast
-
+
@@ -256,7 +256,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast
-
+
diff --git a/AppData/DS_Report.xss b/AppData/DS_Report.xss
index 52ff013..9f9d330 100644
--- a/AppData/DS_Report.xss
+++ b/AppData/DS_Report.xss
@@ -6,7 +6,7 @@
-->
-
+
diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs
index 64763d1..80f2f68 100644
--- a/AppData/DataLayer.cs
+++ b/AppData/DataLayer.cs
@@ -14,7 +14,7 @@ namespace AppData
public DS_AppTableAdapters.StackListTableAdapter taSTL;
public DS_AppTableAdapters.SheetListTableAdapter taSHL;
// reports
- public DS_ReportTableAdapters.prt_StackLabelTableAdapter taRepStack;
+ public DS_ReportTableAdapters.stp_prt_StackLabelTableAdapter taRepStack;
public DS_ReportTableAdapters.PrintJobQueueTableAdapter taPJQ;
public DataLayer()
@@ -46,7 +46,7 @@ namespace AppData
taSTL = new DS_AppTableAdapters.StackListTableAdapter();
taSHL = new DS_AppTableAdapters.SheetListTableAdapter();
// reports
- taRepStack = new DS_ReportTableAdapters.prt_StackLabelTableAdapter();
+ taRepStack = new DS_ReportTableAdapters.stp_prt_StackLabelTableAdapter();
taPJQ = new DS_ReportTableAdapters.PrintJobQueueTableAdapter();
}
diff --git a/AppData/Utils.cs b/AppData/Utils.cs
index 0827678..6cd0282 100644
--- a/AppData/Utils.cs
+++ b/AppData/Utils.cs
@@ -1,7 +1,31 @@
-using System.Collections.Generic;
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Web;
namespace AppData
{
+ public class utils
+ {
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string getPath(string filePath)
+ {
+ string answ = "";
+ try
+ {
+ answ = HttpContext.Current.Server.MapPath(filePath);
+ }
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog($"Eccezione in decodifica path in persorso relativo all'app:{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
+ }
+ return answ;
+ }
+ }
///
/// Classe che rappresenta la richiesta di AZIONI al NESTING
diff --git a/AppData/app.config b/AppData/app.config
index 6f9fb4b..c9adfa6 100644
--- a/AppData/app.config
+++ b/AppData/app.config
@@ -3,9 +3,7 @@
-
+
diff --git a/AppData/packages.config b/AppData/packages.config
index da48877..6632748 100644
--- a/AppData/packages.config
+++ b/AppData/packages.config
@@ -1,5 +1,7 @@
+
+
diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs
index b2c9bd5..67dcf0a 100644
--- a/AppData/reportPrinter.cs
+++ b/AppData/reportPrinter.cs
@@ -171,19 +171,20 @@ namespace AppData
public void printReport(reportRichiesto tipoReport, string printerName, string keyParam, devInfoParam deviceInfoParam)
{
LocalReport report = new LocalReport();
+ report.EnableExternalImages = true;
string deviceInfo = "";
switch (tipoReport)
{
case reportRichiesto.paintLabel:
- report.ReportPath = string.Format(@"{0}\PaintLabel.rdlc", memLayer.ML.cdv("ReportBasePath"));
+ report.ReportPath = string.Format(@"{0}\PaintLabel.rdlc", utils.getPath(memLayer.ML.cdv("ReportBasePath")));
report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocPaint"), caricaDati(tipoReport, keyParam)));
break;
case reportRichiesto.partLabel:
- report.ReportPath = string.Format(@"{0}\PartLabel.rdlc", memLayer.ML.cdv("ReportBasePath"));
+ report.ReportPath = string.Format(@"{0}\PartLabel.rdlc", utils.getPath(memLayer.ML.cdv("ReportBasePath")));
report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocPart"), caricaDati(tipoReport, keyParam)));
break;
case reportRichiesto.stackLabel:
- report.ReportPath = string.Format(@"{0}\StackLabel.rdlc", memLayer.ML.cdv("ReportBasePath"));
+ report.ReportPath = string.Format(@"{0}\StackLabel.rdlc", utils.getPath(memLayer.ML.cdv("ReportBasePath")));
report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocStack"), caricaDati(tipoReport, keyParam)));
break;
}
@@ -238,72 +239,73 @@ namespace AppData
bool answ = false;
int idxPrintJob = 0;
DataLayer dtProx = new DataLayer();
- // gestione coda: SE abilitata...
- if (memLayer.ML.confReadBool("enableQueue"))
+ // gestione coda stampa...
+
+ // incomincio con gestione della coda di stampa... inserisco in tab la richiesta di stampa...
+ if (memLayer.ML.CRB("disable_singleton"))
+ {
+ dtProx.taPJQ.insertQuery(documento.ToString(), keyParam, printerName);
+ }
+ else
+ {
+ DataLayer.man.taPJQ.insertQuery(documento.ToString(), keyParam, printerName);
+ }
+ // faccio un ciclo while... finchè non sono "in testa" alla coda delle esecuzioni aspetto...
+ string nextJob = "ND";
+ try
{
- // incomincio con gestione della coda di stampa... inserisco in tab la richiesta di stampa...
if (memLayer.ML.CRB("disable_singleton"))
{
- dtProx.taPJQ.insertQuery(documento.ToString(), keyParam, printerName);
+ nextJob = dtProx.taPJQ.getNext()[0].KeyParam;
}
else
{
- DataLayer.man.taPJQ.insertQuery(documento.ToString(), keyParam, printerName);
+ nextJob = DataLayer.man.taPJQ.getNext()[0].KeyParam;
}
- // faccio un ciclo while... finchè non sono "in testa" alla coda delle esecuzioni aspetto...
- string nextJob = "ND";
- try
- {
- if (memLayer.ML.CRB("disable_singleton"))
- {
- nextJob = dtProx.taPJQ.getNext()[0].KeyParam;
- }
- else
- {
- nextJob = DataLayer.man.taPJQ.getNext()[0].KeyParam;
- }
- }
- catch
- {
- nextJob = "ND";
- }
- // verifico eventuali processi zombie: quelli in stato 0 con LastTry superiore a data attuale meno zombieMsTime
+ }
+ catch
+ {
+ nextJob = "ND";
+ }
+ // verifico eventuali processi zombie: quelli in stato 0 con LastTry superiore a data attuale meno zombieMsTime
+ if (memLayer.ML.CRB("disable_singleton"))
+ {
+ dtProx.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.confReadInt("zombieMsTime")));
+ }
+ else
+ {
+ DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.confReadInt("zombieMsTime")));
+ }
+ // ora inizio a fare le mie stampe...
+ Random rand = new Random();
+ int msWait = 200;
+ while (nextJob != keyParam)
+ {
+ // indico che ho fatto un tentativo di stampa aggiornando dtLastTry
if (memLayer.ML.CRB("disable_singleton"))
{
- dtProx.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.confReadInt("zombieMsTime")));
+ dtProx.taPJQ.updateLastTry(keyParam);
}
else
{
- DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.confReadInt("zombieMsTime")));
+ DataLayer.man.taPJQ.updateLastTry(keyParam);
}
- // ora inizio a fare le mie stampe...
- Random rand = new Random();
- int msWait = 200;
- while (nextJob != keyParam)
+ // aspetto...
+ msWait = rand.Next(memLayer.ML.confReadInt("minWait"), memLayer.ML.confReadInt("maxWait"));
+ System.Threading.Thread.Sleep(msWait);
+ // leggo prox record da coda
+ if (memLayer.ML.CRB("disable_singleton"))
{
- // indico che ho fatto un tentativo di stampa aggiornando dtLastTry
- if (memLayer.ML.CRB("disable_singleton"))
- {
- dtProx.taPJQ.updateLastTry(keyParam);
- }
- else
- {
- DataLayer.man.taPJQ.updateLastTry(keyParam);
- }
- // aspetto...
- msWait = rand.Next(memLayer.ML.confReadInt("minWait"), memLayer.ML.confReadInt("maxWait"));
- System.Threading.Thread.Sleep(msWait);
- // leggo prox record da coda
- if (memLayer.ML.CRB("disable_singleton"))
- {
- nextJob = dtProx.taPJQ.getNext()[0].KeyParam;
- }
- else
- {
- nextJob = DataLayer.man.taPJQ.getNext()[0].KeyParam;
- }
+ nextJob = dtProx.taPJQ.getNext()[0].KeyParam;
}
- // salvo idx job...
+ else
+ {
+ nextJob = DataLayer.man.taPJQ.getNext()[0].KeyParam;
+ }
+ }
+ // salvo idx job...
+ try
+ {
if (memLayer.ML.CRB("disable_singleton"))
{
idxPrintJob = dtProx.taPJQ.getNext()[0].IdxPrintJob;
@@ -313,6 +315,12 @@ namespace AppData
idxPrintJob = DataLayer.man.taPJQ.getNext()[0].IdxPrintJob;
}
}
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog($"Errore in recupero IdxPrint Job:{exc}", tipoLog.EXCEPTION);
+ }
+
+ // dimensioni pagina
string outForm = "";
string pagWidth = "";
string pagHeigth = "";
@@ -348,34 +356,31 @@ namespace AppData
// compongo parametri stampa
devInfoParam deviceInfo = new devInfoParam(outForm, pagHeigth, pagWidth, margin, margin, margin, margin);
answ = printAndLog(keyParam, printerName, answ, report, deviceInfo);
- // gestione coda: SE abilitata...
- if (memLayer.ML.confReadBool("enableQueue"))
+ if (answ)
{
- if (answ)
+ // registro stampato in tabella queue...
+ if (memLayer.ML.CRB("disable_singleton"))
{
- // registro stampato in tabella queue...
- if (memLayer.ML.CRB("disable_singleton"))
- {
- dtProx.taPJQ.updateStato(idxPrintJob, 1);
- }
- else
- {
- DataLayer.man.taPJQ.updateStato(idxPrintJob, 1);
- }
+ dtProx.taPJQ.updateStato(idxPrintJob, 1);
}
else
{
- // registro annullato in tab queue...
- if (memLayer.ML.CRB("disable_singleton"))
- {
- dtProx.taPJQ.updateStato(idxPrintJob, -1);
- }
- else
- {
- DataLayer.man.taPJQ.updateStato(idxPrintJob, -1);
- }
+ DataLayer.man.taPJQ.updateStato(idxPrintJob, 1);
}
}
+ else
+ {
+ // registro annullato in tab queue...
+ if (memLayer.ML.CRB("disable_singleton"))
+ {
+ dtProx.taPJQ.updateStato(idxPrintJob, -1);
+ }
+ else
+ {
+ DataLayer.man.taPJQ.updateStato(idxPrintJob, -1);
+ }
+
+ }
return answ;
}
///