diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index 87be14d7..72b5f81f 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -3,6 +3,7 @@
+
@@ -58,4 +59,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
index cf225c7f..abcc9980 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
@@ -203,7 +203,11 @@ namespace FineUIPro.Web
List
listCategories = new List();
businessColumn.title = "质量问题统计";
businessColumn.xFontNum = 5;
- var cns = BLL.CNProfessionalService.GetList();
+ //var cns = BLL.CNProfessionalService.GetList();
+ var cns = (from x in Funs.DB.Base_CNProfessional
+ where x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
+ && x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+ select x).ToList();
var checks = from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId == CurrUser.LoginProjectId
select x;
diff --git a/SGGL/FineUIPro.Web/res/images/Organizational.png b/SGGL/FineUIPro.Web/res/images/Organizational.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff29a6459636faa0a0702b976a7b00dbb9fb46e1
GIT binary patch
literal 11018
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 Manager_Month_ComplianceObligations
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Manager_Month_ComplianceObligationsC
{
get
@@ -7944,6 +7967,30 @@ namespace Model
}
}
+ public System.Data.Linq.Table QualityPlanning_ConExperienceSummary
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table QualityPlanning_ProjectQualityPlan
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table QualityPlanning_QualityManagementSys
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table RealName_BasicData
{
get
@@ -8048,6 +8095,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table Report_CQMS_ProblemHandle
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Report_CqmsTarget
{
get
@@ -10104,6 +10159,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table View_ProjectUserWorkPost
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table View_PTP_TestPackageAudit
{
get
@@ -21657,8 +21720,6 @@ namespace Model
private string _CodeRule;
- private EntitySet _Doc_DocManage;
-
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21675,7 +21736,6 @@ namespace Model
public Base_DocType()
{
- this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage));
OnCreated();
}
@@ -21759,19 +21819,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")]
- public EntitySet Doc_DocManage
- {
- get
- {
- return this._Doc_DocManage;
- }
- set
- {
- this._Doc_DocManage.Assign(value);
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -21791,18 +21838,6 @@ namespace Model
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
-
- private void attach_Doc_DocManage(Doc_DocManage entity)
- {
- this.SendPropertyChanging();
- entity.Base_DocType = this;
- }
-
- private void detach_Doc_DocManage(Doc_DocManage entity)
- {
- this.SendPropertyChanging();
- entity.Base_DocType = null;
- }
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")]
@@ -26602,6 +26637,12 @@ namespace Model
private EntitySet _QualityAudit_SubUnitQualityAuditDetail;
+ private EntitySet _QualityPlanning_ConExperienceSummary;
+
+ private EntitySet _QualityPlanning_ProjectQualityPlan;
+
+ private EntitySet _QualityPlanning_QualityManagementSys;
+
private EntitySet _Report_WeekAndMonthReport;
private EntitySet _SafetyData_SafetyDataItem;
@@ -27042,6 +27083,9 @@ namespace Model
this._QualityAudit_InUnit = new EntitySet(new Action(this.attach_QualityAudit_InUnit), new Action(this.detach_QualityAudit_InUnit));
this._QualityAudit_ProjectRecord = new EntitySet(new Action(this.attach_QualityAudit_ProjectRecord), new Action(this.detach_QualityAudit_ProjectRecord));
this._QualityAudit_SubUnitQualityAuditDetail = new EntitySet(new Action(this.attach_QualityAudit_SubUnitQualityAuditDetail), new Action(this.detach_QualityAudit_SubUnitQualityAuditDetail));
+ this._QualityPlanning_ConExperienceSummary = new EntitySet(new Action(this.attach_QualityPlanning_ConExperienceSummary), new Action(this.detach_QualityPlanning_ConExperienceSummary));
+ this._QualityPlanning_ProjectQualityPlan = new EntitySet(new Action(this.attach_QualityPlanning_ProjectQualityPlan), new Action(this.detach_QualityPlanning_ProjectQualityPlan));
+ this._QualityPlanning_QualityManagementSys = new EntitySet(new Action(this.attach_QualityPlanning_QualityManagementSys), new Action(this.detach_QualityPlanning_QualityManagementSys));
this._Report_WeekAndMonthReport = new EntitySet(new Action(this.attach_Report_WeekAndMonthReport), new Action(this.detach_Report_WeekAndMonthReport));
this._SafetyData_SafetyDataItem = new EntitySet(new Action(this.attach_SafetyData_SafetyDataItem), new Action(this.detach_SafetyData_SafetyDataItem));
this._SafetyData_SafetyDataPlan = new EntitySet(new Action(this.attach_SafetyData_SafetyDataPlan), new Action(this.detach_SafetyData_SafetyDataPlan));
@@ -31246,6 +31290,45 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityPlanning_ConExperienceSummary_Base_Project", Storage="_QualityPlanning_ConExperienceSummary", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet QualityPlanning_ConExperienceSummary
+ {
+ get
+ {
+ return this._QualityPlanning_ConExperienceSummary;
+ }
+ set
+ {
+ this._QualityPlanning_ConExperienceSummary.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityPlanning_ProjectQualityPlan_Base_Project", Storage="_QualityPlanning_ProjectQualityPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet QualityPlanning_ProjectQualityPlan
+ {
+ get
+ {
+ return this._QualityPlanning_ProjectQualityPlan;
+ }
+ set
+ {
+ this._QualityPlanning_ProjectQualityPlan.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityPlanning_QualityManagementSys_Base_Project", Storage="_QualityPlanning_QualityManagementSys", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet QualityPlanning_QualityManagementSys
+ {
+ get
+ {
+ return this._QualityPlanning_QualityManagementSys;
+ }
+ set
+ {
+ this._QualityPlanning_QualityManagementSys.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Report_WeekAndMonthReport_Base_Project", Storage="_Report_WeekAndMonthReport", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet Report_WeekAndMonthReport
{
@@ -34927,6 +35010,42 @@ namespace Model
entity.Base_Project = null;
}
+ private void attach_QualityPlanning_ConExperienceSummary(QualityPlanning_ConExperienceSummary entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = this;
+ }
+
+ private void detach_QualityPlanning_ConExperienceSummary(QualityPlanning_ConExperienceSummary entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = null;
+ }
+
+ private void attach_QualityPlanning_ProjectQualityPlan(QualityPlanning_ProjectQualityPlan entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = this;
+ }
+
+ private void detach_QualityPlanning_ProjectQualityPlan(QualityPlanning_ProjectQualityPlan entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = null;
+ }
+
+ private void attach_QualityPlanning_QualityManagementSys(QualityPlanning_QualityManagementSys entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = this;
+ }
+
+ private void detach_QualityPlanning_QualityManagementSys(QualityPlanning_QualityManagementSys entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = null;
+ }
+
private void attach_Report_WeekAndMonthReport(Report_WeekAndMonthReport entity)
{
this.SendPropertyChanging();
@@ -93274,7 +93393,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanName", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanName", DbType="NVarChar(300)")]
public string PlanName
{
get
@@ -98413,10 +98532,10 @@ namespace Model
private string _AuditMan;
- private string _Problem;
-
private string _Measure;
+ private string _Problem;
+
private System.Nullable _RemarkCode;
private EntityRef _Sys_User;
@@ -98465,10 +98584,10 @@ namespace Model
partial void OnStatusChanged();
partial void OnAuditManChanging(string value);
partial void OnAuditManChanged();
- partial void OnProblemChanging(string value);
- partial void OnProblemChanged();
partial void OnMeasureChanging(string value);
partial void OnMeasureChanged();
+ partial void OnProblemChanging(string value);
+ partial void OnProblemChanged();
partial void OnRemarkCodeChanging(System.Nullable value);
partial void OnRemarkCodeChanged();
#endregion
@@ -98838,27 +98957,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")]
- public string Problem
- {
- get
- {
- return this._Problem;
- }
- set
- {
- if ((this._Problem != value))
- {
- this.OnProblemChanging(value);
- this.SendPropertyChanging();
- this._Problem = value;
- this.SendPropertyChanged("Problem");
- this.OnProblemChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="NVarChar(1000)")]
public string Measure
{
get
@@ -98878,6 +98977,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="NVarChar(1000)")]
+ public string Problem
+ {
+ get
+ {
+ return this._Problem;
+ }
+ set
+ {
+ if ((this._Problem != value))
+ {
+ this.OnProblemChanging(value);
+ this.SendPropertyChanging();
+ this._Problem = value;
+ this.SendPropertyChanged("Problem");
+ this.OnProblemChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")]
public System.Nullable RemarkCode
{
@@ -122200,8 +122319,6 @@ namespace Model
private EntityRef _Base_CNProfessional;
- private EntityRef _Base_DocType;
-
private EntityRef _Base_Project;
private EntityRef _Base_Unit;
@@ -122253,7 +122370,6 @@ namespace Model
public Doc_DocManage()
{
this._Base_CNProfessional = default(EntityRef);
- this._Base_DocType = default(EntityRef);
this._Base_Project = default(EntityRef);
this._Base_Unit = default(EntityRef);
this._Sys_User = default(EntityRef);
@@ -122332,10 +122448,6 @@ namespace Model
{
if ((this._DocTypeId != value))
{
- if (this._Base_DocType.HasLoadedOrAssignedValue)
- {
- throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
- }
this.OnDocTypeIdChanging(value);
this.SendPropertyChanging();
this._DocTypeId = value;
@@ -122655,40 +122767,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)]
- public Base_DocType Base_DocType
- {
- get
- {
- return this._Base_DocType.Entity;
- }
- set
- {
- Base_DocType previousValue = this._Base_DocType.Entity;
- if (((previousValue != value)
- || (this._Base_DocType.HasLoadedOrAssignedValue == false)))
- {
- this.SendPropertyChanging();
- if ((previousValue != null))
- {
- this._Base_DocType.Entity = null;
- previousValue.Doc_DocManage.Remove(this);
- }
- this._Base_DocType.Entity = value;
- if ((value != null))
- {
- value.Doc_DocManage.Add(this);
- this._DocTypeId = value.DocTypeId;
- }
- else
- {
- this._DocTypeId = default(string);
- }
- this.SendPropertyChanged("Base_DocType");
- }
- }
- }
-
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -122859,8 +122937,6 @@ namespace Model
private EntityRef _Doc_DocManage;
- private EntityRef _Sys_User;
-
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -122884,7 +122960,6 @@ namespace Model
public Doc_DocManageApprove()
{
this._Doc_DocManage = default(EntityRef);
- this._Sys_User = default(EntityRef);
OnCreated();
}
@@ -122932,7 +123007,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")]
public string ApproveMan
{
get
@@ -122943,10 +123018,6 @@ namespace Model
{
if ((this._ApproveMan != value))
{
- if (this._Sys_User.HasLoadedOrAssignedValue)
- {
- throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
- }
this.OnApproveManChanging(value);
this.SendPropertyChanging();
this._ApproveMan = value;
@@ -123070,40 +123141,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)]
- public Sys_User Sys_User
- {
- get
- {
- return this._Sys_User.Entity;
- }
- set
- {
- Sys_User previousValue = this._Sys_User.Entity;
- if (((previousValue != value)
- || (this._Sys_User.HasLoadedOrAssignedValue == false)))
- {
- this.SendPropertyChanging();
- if ((previousValue != null))
- {
- this._Sys_User.Entity = null;
- previousValue.Doc_DocManageApprove.Remove(this);
- }
- this._Sys_User.Entity = value;
- if ((value != null))
- {
- value.Doc_DocManageApprove.Add(this);
- this._ApproveMan = value.UserId;
- }
- else
- {
- this._ApproveMan = default(string);
- }
- this.SendPropertyChanged("Sys_User");
- }
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -237950,6 +237987,229 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")]
+ public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _ComplianceObligationsId;
+
+ private string _MonthReportId;
+
+ private string _InformationContent;
+
+ private string _ResponseMeasures;
+
+ private string _ImplementationStatus;
+
+ private string _EvaluationConclusion;
+
+ private EntityRef _Manager_MonthReportC;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnComplianceObligationsIdChanging(string value);
+ partial void OnComplianceObligationsIdChanged();
+ partial void OnMonthReportIdChanging(string value);
+ partial void OnMonthReportIdChanged();
+ partial void OnInformationContentChanging(string value);
+ partial void OnInformationContentChanged();
+ partial void OnResponseMeasuresChanging(string value);
+ partial void OnResponseMeasuresChanged();
+ partial void OnImplementationStatusChanging(string value);
+ partial void OnImplementationStatusChanged();
+ partial void OnEvaluationConclusionChanging(string value);
+ partial void OnEvaluationConclusionChanged();
+ #endregion
+
+ public Manager_Month_ComplianceObligations()
+ {
+ this._Manager_MonthReportC = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string ComplianceObligationsId
+ {
+ get
+ {
+ return this._ComplianceObligationsId;
+ }
+ set
+ {
+ if ((this._ComplianceObligationsId != value))
+ {
+ this.OnComplianceObligationsIdChanging(value);
+ this.SendPropertyChanging();
+ this._ComplianceObligationsId = value;
+ this.SendPropertyChanged("ComplianceObligationsId");
+ this.OnComplianceObligationsIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")]
+ public string MonthReportId
+ {
+ get
+ {
+ return this._MonthReportId;
+ }
+ set
+ {
+ if ((this._MonthReportId != value))
+ {
+ if (this._Manager_MonthReportC.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
+ this.OnMonthReportIdChanging(value);
+ this.SendPropertyChanging();
+ this._MonthReportId = value;
+ this.SendPropertyChanged("MonthReportId");
+ this.OnMonthReportIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")]
+ public string InformationContent
+ {
+ get
+ {
+ return this._InformationContent;
+ }
+ set
+ {
+ if ((this._InformationContent != value))
+ {
+ this.OnInformationContentChanging(value);
+ this.SendPropertyChanging();
+ this._InformationContent = value;
+ this.SendPropertyChanged("InformationContent");
+ this.OnInformationContentChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")]
+ public string ResponseMeasures
+ {
+ get
+ {
+ return this._ResponseMeasures;
+ }
+ set
+ {
+ if ((this._ResponseMeasures != value))
+ {
+ this.OnResponseMeasuresChanging(value);
+ this.SendPropertyChanging();
+ this._ResponseMeasures = value;
+ this.SendPropertyChanged("ResponseMeasures");
+ this.OnResponseMeasuresChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")]
+ public string ImplementationStatus
+ {
+ get
+ {
+ return this._ImplementationStatus;
+ }
+ set
+ {
+ if ((this._ImplementationStatus != value))
+ {
+ this.OnImplementationStatusChanging(value);
+ this.SendPropertyChanging();
+ this._ImplementationStatus = value;
+ this.SendPropertyChanged("ImplementationStatus");
+ this.OnImplementationStatusChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")]
+ public string EvaluationConclusion
+ {
+ get
+ {
+ return this._EvaluationConclusion;
+ }
+ set
+ {
+ if ((this._EvaluationConclusion != value))
+ {
+ this.OnEvaluationConclusionChanging(value);
+ this.SendPropertyChanging();
+ this._EvaluationConclusion = value;
+ this.SendPropertyChanged("EvaluationConclusion");
+ this.OnEvaluationConclusionChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)]
+ public Manager_MonthReportC Manager_MonthReportC
+ {
+ get
+ {
+ return this._Manager_MonthReportC.Entity;
+ }
+ set
+ {
+ Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity;
+ if (((previousValue != value)
+ || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._Manager_MonthReportC.Entity = null;
+ previousValue.Manager_Month_ComplianceObligations.Remove(this);
+ }
+ this._Manager_MonthReportC.Entity = value;
+ if ((value != null))
+ {
+ value.Manager_Month_ComplianceObligations.Add(this);
+ this._MonthReportId = value.MonthReportId;
+ }
+ else
+ {
+ this._MonthReportId = default(string);
+ }
+ this.SendPropertyChanged("Manager_MonthReportC");
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")]
public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -244149,6 +244409,8 @@ namespace Model
private EntitySet _Manager_Month_CheckC;
+ private EntitySet _Manager_Month_ComplianceObligations;
+
private EntitySet _Manager_Month_ComplianceObligationsC;
private EntitySet _Manager_Month_CostInvestmentPlanC;
@@ -244421,6 +244683,7 @@ namespace Model
this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC));
this._Manager_Month_ActivityDesC = new EntitySet(new Action
+ style="width: auto; height: 335px;width:355px; position: absolute; flex-shrink: 0; margin: 0px;border-radius:10px;box-shadow:0px 20px 20px #1b1b2a; top: 0px; left: 0px;">