diff --git a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs index 276a4398..6a4cee1e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs @@ -658,6 +658,22 @@ namespace VEPROMS.CSLA.Library OnPropertyChanged("Print_Pagination"); } } + [Category("Print Settings")] + [DisplayName("PDFLocation")] + [RefreshProperties(RefreshProperties.All)] + [Description("PDF Location")] + public string Print_PDFLocation + { + get + { + return _Xp["PrintSettings", "PDFLocation"]; + } + set + { + _Xp["PrintSettings", "PDFLocation"] = value; // save selected value + OnPropertyChanged("Print_PDFLocation"); + } + } #endregion #region Unit // From PROC.INI [Category("Unit")] diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs index 84e5af5d..f506b79d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs @@ -155,13 +155,17 @@ namespace VEPROMS.CSLA.Library { get { - if (_Procedure != null && _Procedure.MyContent.MyFormat != null) return _Procedure.MyContent.MyFormat.PlantFormat.FormatData.Name; - if (_ProcedureInfo != null && _ProcedureInfo.MyContent.MyFormat != null) return _ProcedureInfo.MyContent.MyFormat.PlantFormat.FormatData.Name; + if (_Procedure != null && _Procedure.MyContent.MyFormat != null) return _Procedure.MyContent.MyFormat.FullName; //.PlantFormat.FormatData.Name; + if (_ProcedureInfo != null && _ProcedureInfo.MyContent.MyFormat != null) return _ProcedureInfo.MyContent.MyFormat.FullName;//.PlantFormat.FormatData.Name; return null; } set { - if (_Procedure != null) _Procedure.MyContent.MyFormat = FormatList.ToFormat(value); // Can only be set if _DocVersion is set + if (_Procedure != null) + { + _Procedure.MyContent.MyFormat = FormatList.ToFormat(value); // Can only be set if _DocVersion is set + _Procedure.ActiveFormat = null; + } } } [Category("Format Settings")] diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs index bac9d1ad..39cbf066 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs @@ -354,11 +354,14 @@ namespace VEPROMS.CSLA.Library } public FormatInfo ActiveFormat { - get { return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat; } + get {return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat;} } public FormatInfo LocalFormat { - get { return MyFormat; } + get { + Console.WriteLine("DV Local {0} {1} {2}", (MyFormat == null) ? "MYformat is null" : MyFormat.Name,FormatID,(MyFormat == null)?0:MyFormat.FormatID); + return MyFormat; + } } public ConfigDynamicTypeDescriptor MyConfig { diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index ebd235e4..f2640b78 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1335,13 +1335,16 @@ namespace VEPROMS.CSLA.Library { if (_ActiveFormat == null) _ActiveFormat = (LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat); + Console.WriteLine("Active {0}", (_ActiveFormat == null) ? "_ActiveFormat is null" : _ActiveFormat.Name); return _ActiveFormat; } //get { return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat; } } public FormatInfo LocalFormat { - get { return MyContent.MyFormat; } + get { + Console.WriteLine("Local {0}", (MyContent.MyFormat==null)?"MYformat is null": MyContent.MyFormat.Name); + return MyContent.MyFormat; } } private ConfigDynamicTypeDescriptor _MyConfig=null; public ConfigDynamicTypeDescriptor MyConfig