/ - Diff - HYTOS - 일정관리

개정판 f074a104

ID	f074a104b9acf2af5c39f50243581b31acce7c39
상위	63af7f3c
하위	e9700266

유성호이(가) 일년 이상 전에 추가함

issue #0000
Main Grid
- 이미지 삭제 시 이미지 count 업데이트 되도록 수정
- 이미지 추가 시 이미지 count 업데이트 되도록 수정
- checkbox 클릭 후 combo 데이터 변경 시 해당 checkbox에 해당하는 값이 변경되면 체크박스 전체 데이터 변경 되도록 수정
Excel Import
- Excel Import 시 기존에 바인딩 되어있는 Team, Document No 가 존재하면 해당 데이터 업데이트
- Excel Import 시 기존에 바인딩 되어있는 Team, Document No 가 존재하지 않으면 append 되도록 수정
Save
- Save 로직 수정
Documents Model
- 불필요한 컬럼 삭제
- Team, Document No 비교 class 추가
- Document 값을 복사 및 파일 append를 위한 함수추가

Change-Id: Iedc21f63e38e0140e3ccfec0c12fc492544ee342

                                          DocumentNo = doc.DocumentNo,
                                          RevisonNo = doc.RevisonNo,
                                          RefProjectCode = doc.RefProjectCode,
                                          IsLatest = doc.IsLatest,
                                          JobLevel = doc.JobLevel,
                                          PersonInCharge = doc.PersonInCharge,
                                          IsDeleted = doc.IsDeleted,
                                          RegisteredDate = doc.RegisteredDate,
                                          ModifiedDate = doc.ModifiedDate,
                                          DeletedDate = doc.DeletedDate,
                                          ToIsDiscussion = doc.ToIsDiscussion,
                                          ToRemarks = doc.ToRemarks,
                                          ToCreator = doc.ToCreator,
-...
+                }
+            }
             public bool SetDocumentData(string projectGroupID, List<Documents> docList, List<Documents> delDocList, string userId)
             public bool SetDocumentData(string projectGroupID, List<Documents> docList, List<string> delDocList, string userId)
+            {
                 try
+                {

                 return existCount;
+            }
             public bool SetDocumentData(string projectGroupID, List<Documents> docList, List<Documents> delDocList, string userId)
             public bool SetDocumentData(string projectGroupID, List<Documents> docList, List<string> delDocList, string userId)
+            {
                 bool isSuccess = false;
                 try
+                {
                     #region merge 주석처리
                     /*
+                    {
                         docList.ForEach(x =>
+                        {
                             x.RegisteredUser = userId;
                             x.ModifiedUser = userId;
                         });
                         string query = $@"
     merge into dbo.Documents as tg
     using
+    (
     values
+    (
         @DocumentNo
        ,@RevisonNo
        ,@System
        ,@SubSystemCode
        ,@RefProjectCode
        ,@JobLevel
        ,@PersonInCharge
        ,@RegisteredUser
        ,@ModifiedUser
        ,@ToIsDiscussion
        ,@ToRemarks
        ,@ToCreator
        ,@FrReviewStatus
        ,@FrRemarks
        ,@FrCreator
        ,@ID2StartDate
        ,@ID2EndDate
        ,@ID2Status
        ,@ID2Issues
        ,@ReplyModifications
        ,@ReplyRequester
        ,@IsConvert
        ,@AVEVAPersonInCharge
        ,@AVEVAWorker
        ,@AVEVAConvertDate
        ,@AVEVAReviewDate
        ,@AVEVAWorkDate
        ,@AVEVAStatus
        ,@AVEVAIssues
        ,@ProdReviewer
        ,@ProdIsResult
        ,@ProdRemarks
        ,@ClientReviewer
        ,@ClientIsResult
        ,@ClientRemarks
        ,@DTIsGateWay
        ,@DTIsImport
        ,@DTIsRegSystem
        ,@DTRemarks
+    )
     ) as sc
+    (
         DocumentNo
        ,RevisonNo
        ,[System]
        ,SubSystemCode
        ,RefProjectCode
        ,JobLevel
        ,PersonInCharge
        ,RegisteredUser
        ,ModifiedUser
        ,ToIsDiscussion
        ,ToRemarks
        ,ToCreator
        ,FrReviewStatus
        ,FrRemarks
        ,FrCreator
        ,ID2StartDate
        ,ID2EndDate
        ,ID2Status
        ,ID2Issues
        ,ReplyModifications
        ,ReplyRequester
        ,IsConvert
        ,AVEVAPersonInCharge
        ,AVEVAWorker
        ,AVEVAConvertDate
        ,AVEVAReviewDate
        ,AVEVAWorkDate
        ,AVEVAStatus
        ,AVEVAIssues
        ,ProdReviewer
        ,ProdIsResult
        ,ProdRemarks
        ,ClientReviewer
        ,ClientIsResult
        ,ClientRemarks
        ,DTIsGateWay
        ,DTIsImport
        ,DTIsRegSystem
        ,DTRemarks
+    )
     ON sc.DocumentNo=tg.DocumentNo
     when matched and tg.IsDeleted=0 then
     update
     set    tg.DocumentNo=sc.DocumentNo
           ,tg.RevisonNo=sc.RevisonNo
           ,tg.[System]=sc.[System]
           ,tg.SubSystemCode=sc.SubSystemCode
           ,tg.RefProjectCode=sc.RefProjectCode
           ,tg.JobLevel=sc.JobLevel
           ,tg.PersonInCharge=sc.PersonInCharge
           ,tg.ModifiedDate=getdate()
           ,tg.ModifiedUser=sc.ModifiedUser
           ,tg.ToIsDiscussion=sc.ToIsDiscussion
           ,tg.ToRemarks=sc.ToRemarks
           ,tg.ToCreator=sc.ToCreator
           ,tg.FrReviewStatus=sc.FrReviewStatus
           ,tg.FrRemarks=sc.FrRemarks
           ,tg.FrCreator=sc.FrCreator
           ,tg.ID2StartDate=sc.ID2StartDate
           ,tg.ID2EndDate=sc.ID2EndDate
           ,tg.ID2Status=sc.ID2Status
           ,tg.ID2Issues=sc.ID2Issues
           ,tg.ReplyModifications=sc.ReplyModifications
           ,tg.ReplyRequester=sc.ReplyRequester
           ,tg.IsConvert=sc.IsConvert
           ,tg.AVEVAPersonInCharge=sc.AVEVAPersonInCharge
           ,tg.AVEVAWorker=sc.AVEVAWorker
           ,tg.AVEVAConvertDate=sc.AVEVAConvertDate
           ,tg.AVEVAReviewDate=sc.AVEVAReviewDate
           ,tg.AVEVAWorkDate=sc.AVEVAWorkDate
           ,tg.AVEVAStatus=sc.AVEVAStatus
           ,tg.AVEVAIssues=sc.AVEVAIssues
           ,tg.ProdReviewer=sc.ProdReviewer
           ,tg.ProdIsResult=sc.ProdIsResult
           ,tg.ProdRemarks=sc.ProdRemarks
           ,tg.ClientReviewer=sc.ClientReviewer
           ,tg.ClientIsResult=sc.ClientIsResult
           ,tg.ClientRemarks=sc.ClientRemarks
           ,tg.DTIsGateWay=sc.DTIsGateWay
           ,tg.DTIsImport=sc.DTIsImport
           ,tg.DTIsRegSystem=sc.DTIsRegSystem
           ,tg.DTRemarks=sc.DTRemarks
     when not matched then
     insert
+    (
      DocID
     ,DocumentNo
     ,RevisonNo
     ,[System]
     ,SubSystemCode
     ,RefProjectCode
     ,JobLevel
     ,PersonInCharge
     ,RegisteredDate
     ,RegisteredUser
     ,ToIsDiscussion
     ,ToRemarks
     ,ToCreator
     ,FrReviewStatus
     ,FrRemarks
     ,FrCreator
     ,ID2StartDate
     ,ID2EndDate
     ,ID2Status
     ,ID2Issues
     ,ReplyModifications
     ,ReplyRequester
     ,IsConvert
     ,AVEVAPersonInCharge
     ,AVEVAWorker
     ,AVEVAConvertDate
     ,AVEVAReviewDate
     ,AVEVAWorkDate
     ,AVEVAStatus
     ,AVEVAIssues
     ,ProdReviewer
     ,ProdIsResult
     ,ProdRemarks
     ,ClientReviewer
     ,ClientIsResult
     ,ClientRemarks
     ,DTIsGateWay
     ,DTIsImport
     ,DTIsRegSystem
     ,DTRemarks
+    )
     values
+    (
      lower(newid())
     ,sc.DocumentNo
     ,case when isnull(sc.RevisonNo,'')='' then '0' else sc.RevisonNo end
     ,sc.System
     ,sc.SubSystemCode
     ,sc.RefProjectCode
     ,sc.JobLevel
     ,sc.PersonInCharge
     ,getdate()
     ,sc.RegisteredUser
     ,sc.ToIsDiscussion
     ,sc.ToRemarks
     ,sc.ToCreator
     ,sc.FrReviewStatus
     ,sc.FrRemarks
     ,sc.FrCreator
     ,sc.ID2StartDate
     ,sc.ID2EndDate
     ,sc.ID2Status
     ,sc.ID2Issues
     ,sc.ReplyModifications
     ,sc.ReplyRequester
     ,sc.IsConvert
     ,sc.AVEVAPersonInCharge
     ,sc.AVEVAWorker
     ,sc.AVEVAConvertDate
     ,sc.AVEVAReviewDate
     ,sc.AVEVAWorkDate
     ,sc.AVEVAStatus
     ,sc.AVEVAIssues
     ,sc.ProdReviewer
     ,sc.ProdIsResult
     ,sc.ProdRemarks
     ,sc.ClientReviewer
     ,sc.ClientIsResult
     ,sc.ClientRemarks
     ,sc.DTIsGateWay
     ,sc.DTIsImport
     ,sc.DTIsRegSystem
     ,sc.DTRemarks
+    )
     output $action;";
                         //base.Query QueryFirstOrDefault<string>(query, docList, transaction);
                         //var test = base.Query<string>(query, docList);
                         var test = base.QueryFirstOrDefault<string>(query, docList);
+                    }
                     */
                     #endregion
                     using (var transaction = base.BeginTransaction())
+                    {
                         string query = string.Empty;
-...
                                 parameters.Add("DeletedUser", userId);
                                 var limitDwgNos = delDocList.Skip(paramMaxCount * i).Take(paramMaxCount).Select(x => x.DocID).ToList();
                                 var limitDwgNos = delDocList.Skip(paramMaxCount * i).Take(paramMaxCount).ToList();
                                 sbWhere.Append($@" and DocID in @limitDwgNos ");
                                 parameters.Add("limitDwgNos", limitDwgNos);
-...
             select ''
         end
     end";
                                 #region 기존 입력 쿼리 주석
                                 /*
                                 query = $@"
     declare @tbdoc table(docid varchar(36))
     insert into dbo.Documents
+    (
          DocID
         ,DocumentNo
         ,RevisonNo
         ,System
         ,SubSystemCode
         ,RefProjectCode
         ,JobLevel
         ,PersonInCharge
         ,RegisteredDate
         ,RegisteredUser
         ,ToIsDiscussion
         ,ToRemarks
         ,ToCreator
         ,FrReviewStatus
         ,FrRemarks
         ,FrCreator
         ,ID2StartDate
         ,ID2EndDate
         ,ID2Status
         ,ID2Issues
         ,ReplyModifications
         ,ReplyRequester
         ,IsConvert
         ,AVEVAPersonInCharge
         ,AVEVAWorker
         ,AVEVAConvertDate
         ,AVEVAReviewDate
         ,AVEVAWorkDate
         ,AVEVAStatus
         ,AVEVAIssues
         ,ProdReviewer
         ,ProdIsResult
         ,ProdRemarks
         ,ClientReviewer
         ,ClientIsResult
         ,ClientRemarks
         ,DTIsGateWay
         ,DTIsImport
         ,DTIsRegSystem
         ,DTRemarks
+    )
     output inserted.DocID into @tbdoc
     values
+    (
          lower(newid())
         ,@DocumentNo
         ,case when isnull(@RevisonNo,'')='' then '0' else @RevisonNo end
         ,@System
         ,@SubSystemCode
         ,@RefProjectCode
         ,@JobLevel
         ,@PersonInCharge
         ,getdate()
         ,@RegisteredUser
         ,@ToIsDiscussion
         ,@ToRemarks
         ,@ToCreator
         ,@FrReviewStatus
         ,@FrRemarks
         ,@FrCreator
         ,@ID2StartDate
         ,@ID2EndDate
         ,@ID2Status
         ,@ID2Issues
         ,@ReplyModifications
         ,@ReplyRequester
         ,@IsConvert
         ,@AVEVAPersonInCharge
         ,@AVEVAWorker
         ,@AVEVAConvertDate
         ,@AVEVAReviewDate
         ,@AVEVAWorkDate
         ,@AVEVAStatus
         ,@AVEVAIssues
         ,@ProdReviewer
         ,@ProdIsResult
         ,@ProdRemarks
         ,@ClientReviewer
         ,@ClientIsResult
         ,@ClientRemarks
         ,@DTIsGateWay
         ,@DTIsImport
         ,@DTIsRegSystem
         ,@DTRemarks
+    )
     if @@rowcount > 0
     begin
         select docid from @tbdoc
     end
     else
     begin
         select ''
     end;";
                                 */
                                 #endregion
+                            }
                             else
+                            {

             [DataMember]
             public string RefProjectCode { get; set; }
             [DataMember]
             public bool IsLatest { get; set; }
             [DataMember]
             public string JobLevel { get; set; }
             [DataMember]
             public string PersonInCharge { get; set; }
-...
+                }
+            }
             [DataMember]
             public bool IsDeleted { get; set; }
             [DataMember]
             public DateTime RegisteredDate { get; set; }
             [DataMember]
             public DateTime? ModifiedDate { get; set; }
             [DataMember]
             public DateTime? DeletedDate { get; set; }
             [DataMember]
             public string RegisteredUser { get; set; }
             [DataMember]
             public string ModifiedUser { get; set; }
-...
+                }
                 bool result = other != null && this.DocumentNo == other.DocumentNo && this.RevisonNo == other.RevisonNo && this.System == other.System && this.SubSystemCode == other.SubSystemCode
                     && this.RefProjectCode == other.RefProjectCode && this.IsLatest == other.IsLatest && this.JobLevel == other.JobLevel
                     && this.PersonInCharge == other.PersonInCharge && this.IsDeleted == other.IsDeleted && this.ToIsDiscussion == other.ToIsDiscussion && this.ToRemarks == other.ToRemarks
                     && this.RefProjectCode == other.RefProjectCode && this.JobLevel == other.JobLevel
                     && this.PersonInCharge == other.PersonInCharge && this.ToIsDiscussion == other.ToIsDiscussion && this.ToRemarks == other.ToRemarks
                     && this.ToCreator == other.ToCreator
                     && this.FrReviewStatus == other.FrReviewStatus && this.FrRemarks == other.FrRemarks && this.FrCreator == other.FrCreator
                     && this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2Status == other.ID2Status
-...
             public override int GetHashCode()
+            {
                 return this.DocumentNo.GetNullableHash() + this.RevisonNo.GetNullableHash() + this.System.GetNullableHash() + this.SubSystemCode.GetNullableHash()
                     + this.RefProjectCode.GetNullableHash() + this.IsLatest.GetNullableHash() + this.JobLevel.GetNullableHash()
                     + this.PersonInCharge.GetNullableHash() + this.IsDeleted.GetNullableHash() + this.ToIsDiscussion.GetNullableHash() + this.ToRemarks.GetNullableHash()
                     + this.RefProjectCode.GetNullableHash() + this.JobLevel.GetNullableHash()
                     + this.PersonInCharge.GetNullableHash() + this.ToIsDiscussion.GetNullableHash() + this.ToRemarks.GetNullableHash()
                     + this.ToCreator.GetNullableHash()
                     + this.FrReviewStatus.GetNullableHash() + this.FrRemarks.GetNullableHash() + this.FrCreator.GetNullableHash()
                     + this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2Status.GetNullableHash()
-...
                     + this.DTIsRegSystem.GetNullableHash() + this.DTRemarks.GetNullableHash() + this.ConvertStatus.GetNullableHash();
+            }
             public class DocumentsKeyComparer : IEqualityComparer<Documents>
             public class DocumentsKeyCompare : IEqualityComparer<Documents>
+            {
                 public bool Equals(Documents x, Documents y)
+                {
-...
                     return (obj.DocID != null ? obj.DocID.GetHashCode() : 0);
+                }
+            }
             public class DocumentsUniqueCompare : IEqualityComparer<Documents>
+            {
                 public bool Equals(Documents x, Documents y)
+                {
                     if (x == null && y == null)
                         return true;
                     else if (x == null || y == null)
                         return false;
                     else
+                    {
                         return x.RefProjectCode == y.RefProjectCode && x.DocumentNo == y.DocumentNo;
+                    }
+                }
                 public int GetHashCode(Documents obj)
+                {
                     return (obj.RefProjectCode != null ? obj.RefProjectCode.GetHashCode() : 0) + (obj.DocumentNo != null ? obj.DocumentNo.GetHashCode() : 0);
+                }
+            }
             public void ValueCopy(Documents other)
+            {
                 this.DocumentNo = other.DocumentNo;
                 this.RevisonNo = other.RevisonNo;
                 this.System = other.System;
                 this.SubSystemCode = other.SubSystemCode;
                 this.RefProjectCode = other.RefProjectCode;
                 this.JobLevel = other.JobLevel;
                 this.PersonInCharge = other.PersonInCharge;
                 this.ToIsDiscussion = other.ToIsDiscussion;
                 this.ToRemarks = other.ToRemarks;
                 this.ToCreator = other.ToCreator;
                 this.ToCapture += other.ToCapture;
                 this.FrReviewStatus = other.FrReviewStatus;
                 this.FrRemarks = other.FrRemarks;
                 this.FrCapture += other.FrCapture;
                 this.FrCreator = other.FrCreator;
                 this.ID2StartDate = other.ID2StartDate;
                 this.ID2EndDate = other.ID2EndDate;
                 this.ID2Status = other.ID2Status;
                 this.ID2Issues = other.ID2Issues;
                 this.ID2Capture += other.ID2Capture;
                 this.ReplyModifications = other.ReplyModifications;
                 this.ReplyRequester = other.ReplyRequester;
                 this.IsConvert = other.IsConvert;
                 this.AVEVAPersonInCharge = other.AVEVAPersonInCharge;
                 this.AVEVAWorker = other.AVEVAWorker;
                 this.AVEVAConvertDate = other.AVEVAConvertDate;
                 this.AVEVAReviewDate = other.AVEVAReviewDate;
                 this.AVEVAWorkDate = other.AVEVAWorkDate;
                 this.AVEVAStatus = other.AVEVAStatus;
                 this.AVEVAIssues = other.AVEVAIssues;
                 this.ProdReviewer = other.ProdReviewer;
                 this.ProdIsResult = other.ProdIsResult;
                 this.ProdRemarks = other.ProdRemarks;
                 this.ClientReviewer = other.ClientReviewer;
                 this.ClientIsResult = other.ClientIsResult;
                 this.ClientRemarks = other.ClientRemarks;
                 this.DTIsGateWay = other.DTIsGateWay;
                 this.DTIsImport = other.DTIsImport;
                 this.DTIsRegSystem = other.DTIsRegSystem;
                 this.DTRemarks = other.DTRemarks;
                 if (this.AttFiles == null)
                     this.AttFiles = other.AttFiles;
                 else
                     this.AttFiles.AddRange(other.AttFiles ?? new List<AttFileInfo>());
+            }
+        }
         [DataContract]

             List<Documents> DocList { get; set; }
             List<Documents> OrgList { get; set; }
             List<Documents> SetList { get; set; } = new List<Documents>();
             List<Documents> DelList { get; set; } = new List<Documents>();
             public SetDocumentsWorker(List<Documents> docList, List<Documents> orgDocList, Control parent = null) : base(parent)
+            {
-...
+            }
             protected override void DoWork(BackgroundWorker worker, DoWorkEventArgs e)
+            {
                 /*
                 //수정리스트
                 var sets = this.DocList.Where(x => !this.OrgList.Any(y => y.Equals(x))).ToList();
                 var setorgs = this.OrgList.Intersect(sets, new DocumentsKeyComparer()).ToList();
                 var newsets = sets.Except(this.OrgList, new DocumentsKeyComparer()).ToList();
                 foreach (var newset in newsets)
+                {
                     newset.DocID = null;
+                }
                 if (sets != null && sets.Count > 0)
                 try
+                {
                     this.SetList.AddRange(sets);
+                }
                 //newsets.Select(x => { x.DocID = null; return x; });
                 //sets.Except(this.OrgList, new DocumentsKeyComparer()).Select(x => { x.DocID = null; return x; })
                 //this.OrgList.Except(this.DocList, new DocumentsKeyComparer())
                     //Get Transaction Key
                     bool isTran = false;
                     int trKey = new DocumentController().GetTranKey(informations.ActiveUser.ID, informations.ActiveProject.ProjectID);
                 foreach (var set in sets)
+                {
                     List<AttFileInfo> setAtts = set.AttFiles ?? new List<AttFileInfo>();
                     List<AttFileInfo> orgAtts = new List<AttFileInfo>();
                     List<AttFileInfo> finalAtts = new List<AttFileInfo>();
                     //수정리스트
                     var sets = this.DocList.Where(x => !this.OrgList.Any(y => y.Equals(x))).ToList();
                     var org = setorgs.Where(x => x.DocID == (set.DocID ?? string.Empty)).FirstOrDefault();
                     if (org != null)
                     if (sets.Any())
+                    {
                         if (org.AttFiles != null)
                         sets.ForAll(set =>
+                        {
                             orgAtts = org.AttFiles;
+                        }
+                    }
                     finalAtts.AddRange(orgAtts.Where(x => !setAtts.Any(y => y.FileID.Equals(x.FileID))));
                     finalAtts.AddRange(setAtts.Where(x => !orgAtts.Any(y => y.FileID.Equals(x.FileID))).Select(x => { x.FileID = null; return x; }));
                     if (finalAtts.Count > 0)
+                    {
                         set.AttFiles = finalAtts;
+                    }
                     this.SetList.Add(set);
+                }
                 //this.DocList.Where(x => !this.OrgList.Any(y => y.Equals(x)))
                 //            .ToList().ForEach(x => this.SetList.Add(x));
                 //this.SetList.Intersect(this.OrgList, new DocumentsKeyComparer());
                 //this.SetList.Select(x =>
                 //{
                 //    x.inter (this.OrgList, new DocumentsAttFileComparer())
                 //    return x;
                 //});
                 //var test = this.OrgList.Except(this.DocList, new DocumentsAttFileComparer());
                 */
                 //Get Transaction Key
                 bool isTran = false;
                 int trKey = new DocumentController().GetTranKey(informations.ActiveUser.ID, informations.ActiveProject.ProjectID);
                 //수정리스트
                 this.DocList.Where(x => !this.OrgList.Any(y => y.Equals(x))).ForAll(x => this.SetList.Add(x));
                 foreach (var set in this.SetList)
+                {
                     List<AttFileInfo> setAtts = set.AttFiles ?? new List<AttFileInfo>();
                     List<AttFileInfo> orgAtts = new List<AttFileInfo>();
                     List<AttFileInfo> finalAtts = new List<AttFileInfo>();
                     var org = this.OrgList.Where(x => x.DocID == (set.DocID ?? string.Empty)).FirstOrDefault();
                     if (org != null)
+                    {
                         if (org.AttFiles != null)
+                        {
                             orgAtts = org.AttFiles;
+                        }
+                    }
                             List<AttFileInfo> setAtts = set.AttFiles ?? new List<AttFileInfo>();
                             List<AttFileInfo> orgAtts = new List<AttFileInfo>();
                             var org = this.OrgList.FirstOrDefault(x => x.DocID.Equals(set.DocID ?? string.Empty));
                             if (org != null)
+                            {
                                 if (org.AttFiles != null)
+                                {
                                     orgAtts = org.AttFiles;
+                                }
+                            }
                             List<AttFileInfo> finalAtts = new List<AttFileInfo>();
                     finalAtts.AddRange(orgAtts.Where(x => !setAtts.Any(y => y.FileID.Equals(x.FileID))));
                     finalAtts.AddRange(setAtts.Where(x => !orgAtts.Any(y => y.FileID.Equals(x.FileID))).Select(x => { x.FileID = null; return x; }));
                             finalAtts.AddRange(orgAtts.Where(x => !setAtts.Any(y => y.FileID.Equals(x.FileID))));//삭제된이미지
                             finalAtts.AddRange(setAtts.Where(x => !orgAtts.Any(y => y.FileID.Equals(x.FileID))).Select(x => { x.FileID = null; return x; }));//추가된이미지
                     if (finalAtts.Count > 0)
+                    {
                         set.AttFiles = finalAtts;
                             set.AttFiles = finalAtts;
                         });
+                    }
+                }
                 //삭제리스트
                 this.DelList.AddRange(this.OrgList.Except(this.DocList, new DocumentsKeyComparer()));
                 //e.Result = new DocumentController().SetDocumentData(informations.ActiveProject.ProjectID, SetList, DelList, informations.ActiveUser.ID);
                     //삭제리스트
                     var dels = this.OrgList.Except(this.DocList, new DocumentsKeyCompare()).Select(x => x.DocID).ToList();
                 bool result = false;
                 bool markusPrjResult = false;
                 bool markusDataResult = false;
                 bool markusUserResult = false;
                     bool result = false;
                     bool markusPrjResult = false;
                     bool markusDataResult = false;
                     bool markusUserResult = false;
                 if (trKey > 0)
+                {
                     isTran = new DocumentController().SetTran(trKey, true, true, SetList.Count + DelList.Count, 0);
                     if (isTran)
                     if (trKey > 0)
+                    {
                         result = new DocumentController().SetDocumentData(informations.ActiveProject.ProjectID, SetList, DelList, informations.ActiveUser.ID);
+                    }
+                }
                 if (result)
+                {
                     isTran = new DocumentController().SetTran(trKey, true, false, 0, 0);
                     List<Documents> docs = new DocumentController().GetTrDocuments(trKey).ToList();
                         isTran = new DocumentController().SetTran(trKey, true, true, (sets.Count + dels.Count), 0);
                     isTran = new DocumentController().SetTran(trKey, false, true, 0, docs.Count);
                     if (docs.Any())
+                    {
                         if (isTran)
+                        {
                             markusPrjResult = new MarkusInfoController().SetProperties(informations.ProjectList.Where(x => x.Level == 2).Select(x => x.Name));
                             markusDataResult = new MarkusInfoController().SetMarkusInfo(docs);
                             markusUserResult = new MarkusInfoController().SetMembers(informations.UserList);
                             result = new DocumentController().SetDocumentData(informations.ActiveProject.ProjectID, sets, dels, informations.ActiveUser.ID);
                             if (markusDataResult)
                             if (result)
+                            {
                                 isTran = new DocumentController().SetTran(trKey, false, false, 0, 0);
                                 isTran = new DocumentController().SetTran(trKey, true, false, 0, 0);
                                 List<Documents> docs = new DocumentController().GetTrDocuments(trKey).ToList();
                                 isTran = new DocumentController().SetTran(trKey, false, true, 0, docs.Count);
                                 if (docs.Any())
+                                {
                                     if (isTran)
+                                    {
                                         markusPrjResult = new MarkusInfoController().SetProperties(informations.ProjectList.Where(x => x.Level == 2).Select(x => x.Name));
                                         markusDataResult = new MarkusInfoController().SetMarkusInfo(docs);
                                         markusUserResult = new MarkusInfoController().SetMembers(informations.UserList);
                                         if (markusDataResult)
+                                        {
                                             isTran = new DocumentController().SetTran(trKey, false, false, 0, 0);
+                                        }
+                                    }
+                                }
                                 else
+                                {
                                     markusPrjResult = true;
                                     markusDataResult = true;
                                     markusUserResult = true;
                                     isTran = new DocumentController().SetTran(trKey, false, false, 0, 0);
+                                }
+                            }
+                        }
+                    }
                     else
+                    {
                         markusPrjResult = true;
                         markusDataResult = true;
                         markusUserResult = true;
                         isTran = new DocumentController().SetTran(trKey, false, false, 0, 0);
+                    }
                     e.Result = (result, markusPrjResult, markusDataResult, markusUserResult);
+                }
                 catch (Exception ex)
+                {
                     throw ex;
+                }
                 e.Result = this.GetDwgResult(result, markusPrjResult, markusDataResult, markusUserResult);
+            }
             private (bool isDwg, bool isMarkusPrj, bool isMarkusDwg, bool isMarkusUser) GetDwgResult(bool result, bool markusPrjResult, bool markusDataResult, bool markusUserResult)
+            {
                 return (result, markusPrjResult, markusDataResult, markusUserResult);
+            }
             protected override void WorkCompleted(RunWorkerCompletedEventArgs e)

                 gridViewComboBoxColumn1.FieldName = "RefProjectCode";
                 gridViewComboBoxColumn1.HeaderText = "Team";
                 gridViewComboBoxColumn1.Name = "RefProjectCode";
                 //gridViewComboBoxColumn1.ReadOnly = true;
                 gridViewComboBoxColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
                 gridViewComboBoxColumn1.Width = 150;
                 gridViewTextBoxColumn1.FieldName = "System";
-...
                 gridViewTextBoxColumn3.FieldName = "DocumentNo";
                 gridViewTextBoxColumn3.HeaderText = "DWG_ID";
                 gridViewTextBoxColumn3.Name = "DocumentNo";
                 //gridViewTextBoxColumn3.ReadOnly = true;
                 gridViewTextBoxColumn3.Width = 150;
                 gridViewComboBoxColumn2.EnableExpressionEditor = false;
                 gridViewComboBoxColumn2.FieldName = "PersonInCharge";

     using System.IO;
     using System.Reflection;
     using System.Diagnostics;
     using ID2.Manager.Controls;
     using ID2.Manager.Common;
-...
     using ID2.Manager.Data.Models;
     using ID2.Manager.Forms;
     using ID2.Manager.Controller.Controllers;
     using ID2.Manager.Common.Helpers;
     using static ID2.Manager.Data.Models.Documents;
     using Telerik.WinControls;
     using Telerik.WinControls.UI;
     using Telerik.WinControls.Data;
     using GemBox.Spreadsheet;
     using Newtonsoft.Json;
     using System.Diagnostics;
     using ID2.Manager.Common.Helpers;
     using Telerik.WinControls.UI.Docking;
     namespace ID2.Manager
+    {
-...
                 this.radGridViewDocuments.MasterView.TableSearchRow.SearchProgressChanged += TableSearchRow_SearchProgressChanged;
                 //this.radGridViewDocuments.FilterChanging += RadGridViewDocuments_FilterChanging;
                 this.radGridViewDocuments.FilterChanged += RadGridViewDocuments_FilterChanged;
                 this.radGridViewDocuments.CellValidated += RadGridViewDocuments_CellValidated;
                 this.radGridViewDocuments.ValueChanged += RadGridViewDocuments_ValueChanged;
                 this.radGridViewDocuments.MasterView.TableHeaderRow.MinHeight = 36;
-...
                             if (reslut > 0)
+                            {
                                 switch (e.Category)
+                                {
                                     case "toreview":
                                         doc.ToCapture -= reslut;
                                         break;
                                     case "frreview":
                                         doc.FrCapture -= reslut;
                                         break;
                                     case "id2work":
                                         doc.ID2Capture -= reslut;
                                         break;
+                                }
+                            }
                             else
+                            {
-...
+                            {
                                 category = "frreview";
+                            }
                             //else if (IsDoftech && !selectReview)
                             //{
                             //    category = "prodvalidation";
                             //}
                             //else
                             //{
                             //    category = "clientvalidation";
                             //}
                             else
+                            {
                                 category = "id2work";
+                            }
                             AttFileInfo newFile = new AttFileInfo
+                            {
                                 FileID = Guid.NewGuid().ToString(),
-...
+                            {
                                 case "toreview":
                                     briefAndImagesReview.AddToImage(imageInfo, true);
                                     ++doc.ToCapture;
                                     break;
                                 case "frreview":
                                     briefAndImagesReview.AddFrImage(imageInfo, true);
                                     ++doc.FrCapture;
                                     break;
                                 //case "prodvalidation":
                                 //    briefAndImagesValidation.AddToImage(imageInfo, true);
                                 //    break;
                                 //case "clientvalidation":
                                 //    briefAndImagesValidation.AddFrImage(imageInfo, true);
                                 //    break;
                                 case "id2work":
                                     issueImagesAndAnswerWork.AddImage(imageInfo, true);
                                     ++doc.ID2Capture;
                                     break;
+                            }
+                        }
-...
             private void RadGridViewDocuments_DefaultValuesNeeded(object sender, GridViewRowEventArgs e)
+            {
                 if (e.Row is GridViewNewRowInfo)
+                {
                     e.Row.Cells["Team"].ReadOnly = false;
+                }
                 BindingDocumentToDetailEditor(new Documents());
+            }
-...
                         detailViewCellElement.BackColor2 = Color.FromArgb(214, 214, 214);
+                    }
+                }
                 //else if (e.Row is GridViewNewRowInfo)
                 //{
                 //    switch (e.CellElement.ColumnInfo.Name)
                 //    {
                 //        case "RefProjectCode":
                 //        case "DocumentNo":
                 //            e.CellElement.ColumnInfo.ReadOnly = false;
                 //            break;
                 //    }
                 //}
                 //else if (e.Row is GridViewSummaryRowInfo)
                 //{
                 //    if (e.CellElement is GridRowHeaderCellElement)
-...
                 this.lbSelectAndTotal.Text = $"{e.GridViewTemplate.DataView.Count} / {this.TotalCount} (Selected / Total)";
+            }
             private void RadGridViewDocuments_CellValidated(object sender, CellValidatedEventArgs e)
+            {
                 if (e.Column is GridViewComboBoxColumn)
+                {
                     bool isChecked = e.Row.Cells["Checked"].Value != null && Convert.ToBoolean(e.Row.Cells["Checked"].Value);
                     if (isChecked)
+                    {
                         var chkRows = this.GetCheckedList();
                         if (chkRows.Any())
+                        {
                             switch (e.Column.Name)
+                            {
                                 case "RefProjectCode":
                                 case "PersonInCharge":
                                 case "Worker":
                                 case "JobLevel":
                                 case "ToIsDiscussion":
                                 case "ToCreator":
                                 case "FrReviewStatus":
                                 case "FrCreator":
                                 case "ID2Status":
                                 case "ReplyRequester":
                                 case "IsConvert":
                                 case "AVEVAPersonInCharge":
                                 case "AVEVAWorker":
                                 case "AVEVAStatus":
                                 case "ProdReviewer":
                                 case "ProdIsResult":
                                 case "ClientReviewer":
                                 case "ClientIsResult":
                                 case "DTIsGateWay":
                                 case "DTIsImport":
                                 case "DTIsRegSystem":
                                     chkRows.ForAll(x => x.Cells[e.Column.Name].Value = e.Row.Cells[e.Column.Name].Value);
                                     break;
+                            }
+                        }
+                    }
+                }
+            }
             private void RadGridViewDocuments_ValueChanged(object sender, EventArgs e)
+            {
                 this.radGridViewDocuments.EndEdit();
-...
                         if (result.Error != null)
+                        {
                             RadMessageBox.Show(result.Error, "Information", MessageBoxButtons.OK, RadMessageIcon.Info);
+                        }
                         else
+                        {
                             this.importImages = result.Images;
                             this.documents.AddRange(result.documents);
                             this.importImages = result.Images;//???
                             var intersections = this.documents.Intersect(result.documents, new DocumentsUniqueCompare());
                             var subtractions = result.documents.Except(this.documents, new DocumentsUniqueCompare());
                             if (intersections.Any())
+                            {
                                 var intersectionImports = result.documents.Intersect(this.documents, new DocumentsUniqueCompare());
                                 intersections.ForAll(x =>
+                                {
                                     var intersectionImport = intersectionImports.FirstOrDefault(o => o.RefProjectCode.Equals(x.RefProjectCode) && o.DocumentNo.Equals(x.DocumentNo));
                                     if (intersectionImport != null)
+                                    {
                                         x.ValueCopy(intersectionImport);
+                                    }
                                 });
+                            }
                             this.documents.AddRange(subtractions);
                             if (this.orgDocuments == null) this.orgDocuments = new List<Documents>();
                             this.DocumentListBinding();
                             //briefAndImagesReview.SetImages(this.importImages);
-...
                             RadMessageBox.Show($"Duplicate Dwg No exists.({dupDwgNoCount})", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
                             return;
+                        }
                         //List<string> newDwgNos =  this.documents.Where(x => string.IsNullOrEmpty(x.DocID)).Select(x => x.DocumentNo).ToList();
                         //if (newDwgNos.Count > 0)
                         //{
                         //    dupDwgNoCount = new DocumentController().ExistsDocument(informations.ActiveProject.ProjectID, newDwgNos);
                         //}
                         //if (dupDwgNoCount > 0)
                         //{
                         //    RadMessageBox.Show($"Duplicate Dwg No exists.({dupDwgNoCount})", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
                         //    return;
                         //}
                         #endregion
                         var worker = new SetDocumentsWorker(this.documents, this.orgDocuments, this.radGridViewDocuments);
-...
                             bool isMarkusDwg = false;
                             bool isMarkusUser = false;
                             (isDwg, isMarkusPrj, isMarkusDwg, isMarkusUser) = ((bool, bool, bool, bool ))e.Result;
                             (isDwg, isMarkusPrj, isMarkusDwg, isMarkusUser) = ((bool, bool, bool, bool))e.Result;
                             if (!isDwg)
+                            {
-...
                                 RadMessageBox.Show("Save is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
                                 this.GetDocList();
+                            }
                             //isDwg = result.isDwg;
                             //isMarkusPrj = result.isDwg;
                             //isMarkusDwg = result.isDwg;
                             //isMarkusUser = result.isDwg;
                             //string test = "";
                             //(isDwg, isMarkusPrj, isMarkusDwg, isMarkusUser) = (isDwg, isMarkusPrj, isMarkusDwg, isMarkusUser)e.Result;
                             /*
                             bool result = false;
                             bool markusResult = false;
                             bool markusMembersResult = false;
                             result = (bool)e.Result;
                             if (result)
+                            {
                                 markusResult = new MarkusInfoController().SetProperties(Program.informations.ProjectList.Where(x => x.Level == 2).Select(x => x.Name));
                                 markusResult = new MarkusInfoController().SetMarkusInfo(this.documents);
                                 markusMembersResult = new MarkusInfoController().SetMembers(informations.UserList);
                                 //informations.ProjectList.Where(x => x.Level.Equals(2)); <- ID2 Manager에 저장 된 전체 프로젝트 리스트
+                            }
                             if (result && markusResult && markusMembersResult)
+                            {
                                 RadMessageBox.Show("Save is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
                                 this.GetDocList();
+                            }
                             else if (!result)
+                            {
                                 RadMessageBox.Show("Save is not complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Error);
+                            }
                             else if (!markusResult)
+                            {
                                 RadMessageBox.Show("Markus Data Save is not complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Error);
+                            }
                             else if (!markusMembersResult)
+                            {
                                 RadMessageBox.Show("Markus Members Save is not complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Error);
+                            }
                             */
                         };
                         worker.StartWork();
+                    }

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 f074a104