프로젝트

일반

사용자정보

개정판 664ea2e1

ID664ea2e1cd505cbe9d76095ca8e3f8de5f2e9bd2
상위 9d5b4bc2
하위 5e1e22ff

김태성이(가) 4년 이상 전에 추가함

Markus에서 markusupdate를 변경하도록 수정

Change-Id: I4c2fe33f46732a9dc6b1fe683771c5acbcfd5d36

차이점 보기:

KCOM/Views/MainMenu.xaml.cs
424 424 
                    App.Custom_ViewInfoId = infoId;
425 425 
                }
426 426 
            }
427 
            Logger.sendReqLog("DeleteMarkupAsync", App.ViewInfo.ProjectNO + "," + item.MarkupInfoID, 1);
427 
            //Logger.sendReqLog("DeleteMarkupAsync", App.ViewInfo.ProjectNO + "," + item.MarkupInfoID, 1);
428 428 
            BaseClient.DeleteMarkupAsync(App.ViewInfo.ProjectNO, item.MarkupInfoID);
429 429 
        }
430 430 

  		




  ......




  2551
  2551
  
    

  		




  2552
  2552
  
    
            try


  		




  2553
  2553
  
    
            {


  		




  2554
  
  
    
                Logger.sendReqLog("GetSymbolImageURL: ", id + "," + SelectedIndex, 1);


  		




  
  2554
  
    
                //Logger.sendReqLog("GetSymbolImageURL: ", id + "," + SelectedIndex, 1);


  		




  2555
  2555
  
    
                Data_ = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolImageURL(id, SelectedIndex);


  		




  2556
  2556
  
    
                if (Data_ != null || Data_ != "")


  		




  2557
  2557
  
    
                {


  		




  2558
  
  
    
                    Logger.sendResLog("GetSymbolImageURL", "TRUE", 1);


  		




  
  2558
  
    
                    //Logger.sendResLog("GetSymbolImageURL", "TRUE", 1);


  		




  2559
  2559
  
    
                }


  		




  2560
  2560
  
    
                else


  		




  2561
  2561
  
    
                {


  		




  2562
  
  
    
                    Logger.sendResLog("GetSymbolImageURL", "FALSE", 1);


  		




  
  2562
  
    
                    //Logger.sendResLog("GetSymbolImageURL", "FALSE", 1);


  		




  2563
  2563
  
    
                }


  		




  2564
  2564
  
    

  		




  2565
  2565
  
    
                //MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP


  		




  ......




  3860
  3860
  
    
                                    (currentControl as TextControl).CommentAngle = Ang;


  		




  3861
  3861
  
    
                                    (currentControl as TextControl).ControlType_No = 2;


  		




  3862
  3862
  
    
                                    (currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape;


  		




  
  3863
  
    
                                    (currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));


  		




  
  3864
  
    

  		




  3863
  3865
  
    
                                    (currentControl as TextControl).ApplyTemplate();


  		




  3864
  3866
  
    
                                    (currentControl as TextControl).Base_TextBox.Focus();


  		




  3865
  3867
  
    
                                    CreateCommand.Instance.Execute(currentControl);


  		




  3866
  
  
    
                                    (currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));


  		




  
  3868
  
    
                                    


  		




  3867
  3869
  
    
                                    //currentControl = null;


  		




  3868
  3870
  
    
                                }


  		




  3869
  3871
  
    
                            }


  		




  ......




  4571
  4573
  
    
            {


  		




  4572
  4574
  
    
                if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID))


  		




  4573
  4575
  
    
                {


  		




  4574
  
  
    
                    Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item.MarkupInfoID + "," + _ViewInfo.UserID, 1);


  		




  
  4576
  
    
                    //Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item.MarkupInfoID + "," + _ViewInfo.UserID, 1);


  		




  4575
  4577
  
    
                    BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID);


  		




  4576
  4578
  
    
                }


  		




  4577
  4579
  
    
                else


  		




  ......




  4624
  4626
  
    
                {


  		




  4625
  4627
  
    
                    markupInfoItems.Add(item);


  		




  4626
  4628
  
    
                }


  		




  4627
  
  
    
                Logger.sendReqLog("Consolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);


  		




  4628
  
  
    
                Logger.sendResLog("Consolidate", this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);


  		




  4629
  
  
    
                Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);


  		




  
  4629
  
    
                //Logger.sendReqLog("Consolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);


  		




  
  4630
  
    
                //Logger.sendResLog("Consolidate", this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);


  		




  
  4631
  
    
                //Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);


  		




  4630
  4632
  
    
                var items = this.BaseClient.GetMarkupInfoItems(App.ViewInfo.ProjectNO, _DocInfo.ID);


  		




  4631
  4633
  
    

  		




  4632
  4634
  
    
                var item2 = items.Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault();


  		




  4633
  4635
  
    
                if (item2 != null)


  		




  4634
  4636
  
    
                {


  		




  4635
  
  
    
                    Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);


  		




  
  4637
  
    
                    //Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);


  		




  4636
  4638
  
    

  		




  4637
  4639
  
    
                    BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID);


  		




  4638
  4640
  
    
                    BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID);


  		




  ......




  4920
  4922
  
    
                    ViewerDataModel.Instance.PageNumber = 1;


  		




  4921
  4923
  
    
                }


  		




  4922
  4924
  
    

  		




  4923
  
  
    
                Logger.sendReqLog("GetCompareRectAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID + "," + CurrentRev.DOCUMENT_ID +


  		




  4924
  
  
    
                    "," + pageNavigator.CurrentPage.PageNumber.ToString() + "," + ViewerDataModel.Instance.PageNumber.ToString() + "," +


  		




  4925
  
  
    
                    userData.COMPANY != "EXT" ? "true" : "false", 1);


  		




  
  4925
  
    
                //Logger.sendReqLog("GetCompareRectAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID + "," + CurrentRev.DOCUMENT_ID +"," + pageNavigator.CurrentPage.PageNumber.ToString() + "," + ViewerDataModel.Instance.PageNumber.ToString() + "," + userData.COMPANY != "EXT" ? "true" : "false", 1);


  		




  4926
  4926
  
    

  		




  4927
  4927
  
    
                BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString(), userData.COMPANY != "EXT" ? "true" : "false");


  		




  4928
  4928
  
    
            }


  		




  ......




  4992
  4992
  
    
                        gridViewHistory_Busy.IsBusy = false;


  		




  4993
  4993
  
    
                    }


  		




  4994
  4994
  
    

  		




  4995
  
  
    
                    Logger.sendResLog("GetSyncMarkupInfoItemsCompleted", "UserState : " + ea.UserState + "\r Result :" + ea.Result + "\r Cancelled :" + ea.Cancelled + "\r Error :" + ea.Error, 1);


  		




  
  4995
  
    
                    //Logger.sendResLog("GetSyncMarkupInfoItemsCompleted", "UserState : " + ea.UserState + "\r Result :" + ea.Result + "\r Cancelled :" + ea.Cancelled + "\r Error :" + ea.Error, 1);


  		




  4996
  4996
  
    

  		




  4997
  4997
  
    
                    if (GetSyncMarkupInfoItemshandler != null)


  		




  4998
  4998
  
    
                    {


  		




  ......




  5007
  5007
  
    
                BaseClient.GetSyncMarkupInfoItemsCompleted += GetSyncMarkupInfoItemshandler;


  		




  5008
  5008
  
    
                BaseClient.GetSyncMarkupInfoItemsAsync(_ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, _ViewInfo.UserID);


  		




  5009
  5009
  
    

  		




  5010
  
  
    
                Logger.sendReqLog("GetSyncMarkupInfoItemsAsync", _ViewInfo.ProjectNO + "," + CurrentRev.DOCUMENT_ID + "," + _ViewInfo.UserID, 1);


  		




  
  5010
  
    
                //Logger.sendReqLog("GetSyncMarkupInfoItemsAsync", _ViewInfo.ProjectNO + "," + CurrentRev.DOCUMENT_ID + "," + _ViewInfo.UserID, 1);


  		




  5011
  5011
  
    
            }


  		




  5012
  5012
  
    
        }


  		




  5013
  5013
  
    

  		




  ......




  5030
  5030
  
    
            }


  		




  5031
  5031
  
    
            catch (Exception ex)


  		




  5032
  5032
  
    
            {


  		




  5033
  
  
    
                Logger.sendResLog("EnsembleLink_Button_Click", ex.Message, 0);


  		




  
  5033
  
    
                //Logger.sendResLog("EnsembleLink_Button_Click", ex.Message, 0);


  		




  5034
  5034
  
    
            }


  		




  5035
  5035
  
    
        }


  		




  5036
  5036
  
    

  		




  ......




  5096
  5096
  
    
                    tlSyncPageNum.Text = String.Format("Current Page : {0}", pageNavigator.CurrentPage.PageNumber);


  		




  5097
  5097
  
    
                    gridViewHistory_Busy.IsBusy = false;


  		




  5098
  5098
  
    
                }


  		




  5099
  
  
    
                Logger.sendResLog("GetSyncMarkupInfoItemsCompleted", "UserState : " + ea.UserState + "\r Result :" + ea.Result + "\r Cancelled :" + ea.Cancelled + "\r Error :" + ea.Error, 1);


  		




  
  5099
  
    
                //Logger.sendResLog("GetSyncMarkupInfoItemsCompleted", "UserState : " + ea.UserState + "\r Result :" + ea.Result + "\r Cancelled :" + ea.Cancelled + "\r Error :" + ea.Error, 1);


  		




  5100
  5100
  
    
            };


  		




  5101
  
  
    
            Logger.sendReqLog("GetSyncMarkupInfoItemsAsync", _ViewInfo.ProjectNO + "," + CurrentRev.DOCUMENT_ID + "," + _ViewInfo.UserID, 1);


  		




  
  5101
  
    
            //Logger.sendReqLog("GetSyncMarkupInfoItemsAsync", _ViewInfo.ProjectNO + "," + CurrentRev.DOCUMENT_ID + "," + _ViewInfo.UserID, 1);


  		




  5102
  5102
  
    
            BaseClient.GetSyncMarkupInfoItemsAsync(_ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, _ViewInfo.UserID);


  		




  5103
  5103
  
    
        }


  		




  5104
  5104
  
    

  		




  ......




  5293
  5293
  
    
                };


  		




  5294
  5294
  
    

  		




  5295
  5295
  
    
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolCompleted += BaseClient_SaveSymbolCompleted;


  		




  5296
  
  
    
                Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);


  		




  
  5296
  
    
                //Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);


  		




  5297
  5297
  
    
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolAsync(symbol_private);


  		




  5298
  5298
  
    
            }


  		




  5299
  5299
  
    
            catch (Exception)


  		




  ......




  5315
  5315
  
    
                    DATA = Data


  		




  5316
  5316
  
    
                };


  		




  5317
  5317
  
    
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbolCompleted += BaseClient_AddPublicSymbolCompleted;


  		




  5318
  
  
    
                Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);


  		




  
  5318
  
    
                //Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);


  		




  5319
  5319
  
    
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbol(symbol_public);


  		




  5320
  5320
  
    
            }


  		




  5321
  5321
  
    
            catch (Exception)


  		




  ......




  5326
  5326
  
    

  		




  5327
  5327
  
    
        private void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e)


  		




  5328
  5328
  
    
        {


  		




  5329
  
  
    
            Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);


  		




  
  5329
  
    
            //Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);


  		




  5330
  5330
  
    
            DataBind();


  		




  5331
  5331
  
    
        }


  		




  5332
  5332
  
    

  		




  5333
  5333
  
    
        private void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e)


  		




  5334
  5334
  
    
        {


  		




  5335
  
  
    
            Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);


  		




  
  5335
  
    
            //Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);


  		




  5336
  5336
  
    
            DataBind();


  		




  5337
  5337
  
    
        }


  		




  5338
  5338
  
    

  		




  ......




  5622
  5622
  
    
            string projectno = App.ViewInfo.ProjectNO;


  		




  5623
  5623
  
    
            string checklist_id = ViewerDataModel.Instance.CheckList_ID;


  		




  5624
  5624
  
    

  		




  5625
  
  
    
            Logger.sendReqLog("GetCheckList", projectno + "," + checklist_id, 1);


  		




  
  5625
  
    
            //Logger.sendReqLog("GetCheckList", projectno + "," + checklist_id, 1);


  		




  5626
  5626
  
    
            Item = this.BaseClient.GetCheckList(projectno, checklist_id);


  		




  5627
  5627
  
    
            if (Item != null)


  		




  5628
  5628
  
    
            {


  		




  5629
  
  
    
                Logger.sendResLog("GetCheckList", "TRUE", 1);


  		




  
  5629
  
    
                //Logger.sendResLog("GetCheckList", "TRUE", 1);


  		




  5630
  5630
  
    
            }


  		




  5631
  5631
  
    
            else


  		




  5632
  5632
  
    
            {


  		




  5633
  
  
    
                Logger.sendResLog("GetCheckList", "FALSE", 1);


  		




  
  5633
  
    
                //Logger.sendResLog("GetCheckList", "FALSE", 1);


  		




  5634
  5634
  
    
            }


  		




  5635
  5635
  
    

  		




  5636
  5636
  
    
            if (Item == null)


  		




  ......




  5651
  5651
  
    
                    DOCUMENT_NO = _DocItem.DOCUMENT_NO,


  		




  5652
  5652
  
    
                    STATUS_DESC_OPEN = "Vendor 반영 필요",


  		




  5653
  5653
  
    
                };


  		




  5654
  
  
    
                Logger.sendReqLog("AddCheckList", projectno + "," + check_, 1);


  		




  5655
  
  
    
                Logger.sendResLog("AddCheckList", this.BaseClient.AddCheckList(projectno, check_).ToString(), 1);


  		




  
  5654
  
    
                //Logger.sendReqLog("AddCheckList", projectno + "," + check_, 1);


  		




  
  5655
  
    
                //Logger.sendResLog("AddCheckList", this.BaseClient.AddCheckList(projectno, check_).ToString(), 1);


  		




  5656
  5656
  
    
                //this.BaseClient.AddCheckList(projectno, check_);


  		




  5657
  5657
  
    
            }


  		




  5658
  5658
  
    
            else


  		




  ......




  5660
  5660
  
    
                Item.IMAGE_URL = Result;


  		




  5661
  5661
  
    
                Item.IMAGE_ANCHOR = x + "," + y + "," + width + "," + height;


  		




  5662
  5662
  
    
                Item.PAGENUMBER = this.pageNavigator.CurrentPage.PageNumber;


  		




  5663
  
  
    
                Logger.sendReqLog("SaveCheckList", projectno + "," + checklist_id + "," + Item, 1);


  		




  5664
  
  
    
                Logger.sendResLog("SaveCheckList", this.BaseClient.SaveCheckList(projectno, checklist_id, Item).ToString(), 1);


  		




  
  5663
  
    
                //Logger.sendReqLog("SaveCheckList", projectno + "," + checklist_id + "," + Item, 1);


  		




  
  5664
  
    
                //Logger.sendResLog("SaveCheckList", this.BaseClient.SaveCheckList(projectno, checklist_id, Item).ToString(), 1);


  		




  5665
  5665
  
    
                //this.BaseClient.SaveCheckList(projectno, checklist_id, Item);


  		




  5666
  5666
  
    
            }


  		




  5667
  5667
  
    
        }


  		




  ......




  5853
  5853
  
    
            }


  		




  5854
  5854
  
    
            catch (Exception ex)


  		




  5855
  5855
  
    
            {


  		




  5856
  
  
    
                Logger.sendResLog("zoomAndPanControl_Drop", ex.ToString(), 0);


  		




  
  5856
  
    
                //Logger.sendResLog("zoomAndPanControl_Drop", ex.ToString(), 0);


  		




  5857
  5857
  
    
            }


  		




  5858
  5858
  
    
        }


  		




  5859
  5859
  
    
        */


  		












내보내기  Unified diff




         
        

    















   



  

  
  클립보드 이미지 추가
  (최대 크기: 500 MB)