프로젝트

일반

사용자정보

개정판 0b75c341

ID0b75c34175cdc8e65077615292b5c6e0a8effa59
상위 a2a00b53
하위 63a36cc0

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

PEMSS의 정합성 코멘트는 제외하고 Export 되도록 수정

Change-Id: I289cc872cf12b9d43fb415d0381271acca61f00a

차이점 보기:

CommonLib/Common.cs
129 129
            
130 130
            return Regex.Unescape(Encoding.UTF8.GetString(byte64));
131 131
        }
132
        /// <summary>
132
        /// <summary> 
133 133
        /// 서버에 설치된 Service ini 의 Connection String 을 참조
134 134
        /// </summary>
135 135
        /// <returns></returns>
KCOM.sln
232 232
	GlobalSection(Performance) = preSolution
233 233
		HasPerformanceSessions = true
234 234
	EndGlobalSection
235
	GlobalSection(Performance) = preSolution
236
		HasPerformanceSessions = true
237
	EndGlobalSection
238
	GlobalSection(Performance) = preSolution
239
		HasPerformanceSessions = true
240
	EndGlobalSection
235 241
EndGlobal
KCOM/App.xaml.cs
243 243

  
244 244
                _EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
245 245

  
246
//#if DEBUG
247
//                _PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", "http://localhost:13009"));
248
//#else
249
//                          _PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", sBaseServiceURL));
250
//#endif
246
#if DEBUG
247
                _PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", "http://localhost:13009"));
248
#else
249
                          _PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", sBaseServiceURL));
250
#endif
251 251

  
252
                _PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", sBaseServiceURL));
253 252
                await SplashScreenAsnyc();
254 253
                base.OnStartup(e);
255 254

  
KCOM/Connected Services/ServiceDeepView/KCOM.ServiceDeepView.MarkupKeyValue.datasource
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--
3
    This file is automatically generated by Visual Studio .Net. It is 
4
    used to store generic object data source configuration information.  
5
    Renaming the file extension or editing the content of this file may   
6
    cause the file to be unrecognizable by the program.
7
-->
8
<GenericObjectDataSource DisplayName="MarkupKeyValue" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
9
   <TypeInfo>KCOM.ServiceDeepView.MarkupKeyValue, Connected Services.ServiceDeepView.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
10
</GenericObjectDataSource>
KCOM/Connected Services/ServiceDeepView/Reference.cs
179 179
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
180 180
    [System.Runtime.Serialization.DataContractAttribute(Name="EntityKeyMember", Namespace="http://schemas.datacontract.org/2004/07/System.Data")]
181 181
    [System.SerializableAttribute()]
182
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalPDFResult))]
183
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalStatus))]
184
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityObject))]
185
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.StructuralObject))]
186
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfDOCINFOitJtO6kG))]
187
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReference))]
188
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.RelatedEnd))]
189
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMARKUP_INFO_VERSIONitJtO6kG))]
190
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMARKUP_INFOitJtO6kG))]
191
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMEMBERitJtO6kG))]
192
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_SystemInfo))]
193
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_BasicParam))]
194
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.VPRevision>))]
195
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.VPRevision))]
196
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupInfoItem>))]
197
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupInfoItem))]
198
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupItem>))]
199
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupItem))]
200
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.FAVORITE_FLAG))]
201
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityKey))]
202
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOM.ServiceDeepView.EntityKeyMember>))]
203
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<System.Windows.Rect>))]
204
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Windows.Rect))]
205
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
206 182
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC>))]
207 183
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.FAVORITE_DOC))]
208 184
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCINFO))]
......
234 210
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOMDataModel.DataModel.FINAL_PDF>))]
235 211
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.PROPERTIES))]
236 212
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOMDataModel.DataModel.PROPERTIES>))]
213
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
214
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalPDFResult))]
215
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalStatus))]
216
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_SystemInfo))]
217
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_BasicParam))]
218
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.VPRevision>))]
219
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.VPRevision))]
220
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupInfoItem>))]
221
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupInfoItem))]
222
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupItem>))]
223
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupItem))]
224
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.FAVORITE_FLAG))]
225
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue>))]
226
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.MarkupKeyValue))]
227
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<System.Windows.Rect>))]
228
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Windows.Rect))]
229
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityObject))]
230
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.StructuralObject))]
231
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfDOCINFOitJtO6kG))]
232
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReference))]
233
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.RelatedEnd))]
234
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMARKUP_INFO_VERSIONitJtO6kG))]
235
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMARKUP_INFOitJtO6kG))]
236
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMEMBERitJtO6kG))]
237
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityKey))]
238
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOM.ServiceDeepView.EntityKeyMember>))]
237 239
    public partial class EntityKeyMember : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
238 240
        
239 241
        [System.NonSerializedAttribute()]
......
419 421
    
420 422
    [System.Diagnostics.DebuggerStepThroughAttribute()]
421 423
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
424
    [System.Runtime.Serialization.DataContractAttribute(Name="MarkupKeyValue", Namespace="http://schemas.datacontract.org/2004/07/KCOM_API")]
425
    [System.SerializableAttribute()]
426
    public partial class MarkupKeyValue : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
427
        
428
        [System.NonSerializedAttribute()]
429
        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
430
        
431
        [System.Runtime.Serialization.OptionalFieldAttribute()]
432
        private string DataField;
433
        
434
        [System.Runtime.Serialization.OptionalFieldAttribute()]
435
        private string IDField;
436
        
437
        [global::System.ComponentModel.BrowsableAttribute(false)]
438
        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
439
            get {
440
                return this.extensionDataField;
441
            }
442
            set {
443
                this.extensionDataField = value;
444
            }
445
        }
446
        
447
        [System.Runtime.Serialization.DataMemberAttribute()]
448
        public string Data {
449
            get {
450
                return this.DataField;
451
            }
452
            set {
453
                if ((object.ReferenceEquals(this.DataField, value) != true)) {
454
                    this.DataField = value;
455
                    this.RaisePropertyChanged("Data");
456
                }
457
            }
458
        }
459
        
460
        [System.Runtime.Serialization.DataMemberAttribute()]
461
        public string ID {
462
            get {
463
                return this.IDField;
464
            }
465
            set {
466
                if ((object.ReferenceEquals(this.IDField, value) != true)) {
467
                    this.IDField = value;
468
                    this.RaisePropertyChanged("ID");
469
                }
470
            }
471
        }
472
        
473
        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
474
        
475
        protected void RaisePropertyChanged(string propertyName) {
476
            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
477
            if ((propertyChanged != null)) {
478
                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
479
            }
480
        }
481
    }
482
    
483
    [System.Diagnostics.DebuggerStepThroughAttribute()]
484
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
422 485
    [System.Runtime.Serialization.DataContractAttribute(Name="EntityReferenceOfDOCINFOitJtO6kG", Namespace="http://schemas.datacontract.org/2004/07/System.Data.Objects.DataClasses")]
423 486
    [System.SerializableAttribute()]
424 487
    public partial class EntityReferenceOfDOCINFOitJtO6kG : KCOM.ServiceDeepView.EntityReference {
......
806 869
        
807 870
        System.Collections.Generic.List<string> EndGetMarkupDataListperPage(System.IAsyncResult result);
808 871
        
872
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/GetMarkupDataForPage", ReplyAction="urn:ServiceDeepView/GetMarkupDataForPageResponse")]
873
        System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue> GetMarkupDataForPage(string project_no, string _markupinfoid, int _pageNo);
874
        
875
        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="urn:ServiceDeepView/GetMarkupDataForPage", ReplyAction="urn:ServiceDeepView/GetMarkupDataForPageResponse")]
876
        System.IAsyncResult BeginGetMarkupDataForPage(string project_no, string _markupinfoid, int _pageNo, System.AsyncCallback callback, object asyncState);
877
        
878
        System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue> EndGetMarkupDataForPage(System.IAsyncResult result);
879
        
809 880
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/AddMarkupInfo", ReplyAction="urn:ServiceDeepView/AddMarkupInfoResponse")]
810 881
        bool AddMarkupInfo(string project_no, KCOMDataModel.DataModel.MARKUP_INFO value);
811 882
        
......
1796 1867
    
1797 1868
    [System.Diagnostics.DebuggerStepThroughAttribute()]
1798 1869
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
1870
    public partial class GetMarkupDataForPageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
1871
        
1872
        private object[] results;
1873
        
1874
        public GetMarkupDataForPageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
1875
                base(exception, cancelled, userState) {
1876
            this.results = results;
1877
        }
1878
        
1879
        public System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue> Result {
1880
            get {
1881
                base.RaiseExceptionIfNecessary();
1882
                return ((System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue>)(this.results[0]));
1883
            }
1884
        }
1885
    }
1886
    
1887
    [System.Diagnostics.DebuggerStepThroughAttribute()]
1888
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
1799 1889
    public partial class AddMarkupInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
1800 1890
        
1801 1891
        private object[] results;
......
2685 2775
        
2686 2776
        private System.Threading.SendOrPostCallback onGetMarkupDataListperPageCompletedDelegate;
2687 2777
        
2778
        private BeginOperationDelegate onBeginGetMarkupDataForPageDelegate;
2779
        
2780
        private EndOperationDelegate onEndGetMarkupDataForPageDelegate;
2781
        
2782
        private System.Threading.SendOrPostCallback onGetMarkupDataForPageCompletedDelegate;
2783
        
2688 2784
        private BeginOperationDelegate onBeginAddMarkupInfoDelegate;
2689 2785
        
2690 2786
        private EndOperationDelegate onEndAddMarkupInfoDelegate;
......
2988 3084
        
2989 3085
        public event System.EventHandler<GetMarkupDataListperPageCompletedEventArgs> GetMarkupDataListperPageCompleted;
2990 3086
        
3087
        public event System.EventHandler<GetMarkupDataForPageCompletedEventArgs> GetMarkupDataForPageCompleted;
3088
        
2991 3089
        public event System.EventHandler<AddMarkupInfoCompletedEventArgs> AddMarkupInfoCompleted;
2992 3090
        
2993 3091
        public event System.EventHandler<AddMarkupInfoVersionCompletedEventArgs> AddMarkupInfoVersionCompleted;
......
5024 5122
                        _pageNo}, this.onEndGetMarkupDataListperPageDelegate, this.onGetMarkupDataListperPageCompletedDelegate, userState);
5025 5123
        }
5026 5124
        
5125
        public System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue> GetMarkupDataForPage(string project_no, string _markupinfoid, int _pageNo) {
5126
            return base.Channel.GetMarkupDataForPage(project_no, _markupinfoid, _pageNo);
5127
        }
5128
        
5129
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
5130
        public System.IAsyncResult BeginGetMarkupDataForPage(string project_no, string _markupinfoid, int _pageNo, System.AsyncCallback callback, object asyncState) {
5131
            return base.Channel.BeginGetMarkupDataForPage(project_no, _markupinfoid, _pageNo, callback, asyncState);
5132
        }
5133
        
5134
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
5135
        public System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue> EndGetMarkupDataForPage(System.IAsyncResult result) {
5136
            return base.Channel.EndGetMarkupDataForPage(result);
5137
        }
5138
        
5139
        private System.IAsyncResult OnBeginGetMarkupDataForPage(object[] inValues, System.AsyncCallback callback, object asyncState) {
5140
            string project_no = ((string)(inValues[0]));
5141
            string _markupinfoid = ((string)(inValues[1]));
5142
            int _pageNo = ((int)(inValues[2]));
5143
            return this.BeginGetMarkupDataForPage(project_no, _markupinfoid, _pageNo, callback, asyncState);
5144
        }
5145
        
5146
        private object[] OnEndGetMarkupDataForPage(System.IAsyncResult result) {
5147
            System.Collections.Generic.List<KCOM.ServiceDeepView.MarkupKeyValue> retVal = this.EndGetMarkupDataForPage(result);
5148
            return new object[] {
5149
                    retVal};
5150
        }
5151
        
5152
        private void OnGetMarkupDataForPageCompleted(object state) {
5153
            if ((this.GetMarkupDataForPageCompleted != null)) {
5154
                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
5155
                this.GetMarkupDataForPageCompleted(this, new GetMarkupDataForPageCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
5156
            }
5157
        }
5158
        
5159
        public void GetMarkupDataForPageAsync(string project_no, string _markupinfoid, int _pageNo) {
5160
            this.GetMarkupDataForPageAsync(project_no, _markupinfoid, _pageNo, null);
5161
        }
5162
        
5163
        public void GetMarkupDataForPageAsync(string project_no, string _markupinfoid, int _pageNo, object userState) {
5164
            if ((this.onBeginGetMarkupDataForPageDelegate == null)) {
5165
                this.onBeginGetMarkupDataForPageDelegate = new BeginOperationDelegate(this.OnBeginGetMarkupDataForPage);
5166
            }
5167
            if ((this.onEndGetMarkupDataForPageDelegate == null)) {
5168
                this.onEndGetMarkupDataForPageDelegate = new EndOperationDelegate(this.OnEndGetMarkupDataForPage);
5169
            }
5170
            if ((this.onGetMarkupDataForPageCompletedDelegate == null)) {
5171
                this.onGetMarkupDataForPageCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetMarkupDataForPageCompleted);
5172
            }
5173
            base.InvokeAsync(this.onBeginGetMarkupDataForPageDelegate, new object[] {
5174
                        project_no,
5175
                        _markupinfoid,
5176
                        _pageNo}, this.onEndGetMarkupDataForPageDelegate, this.onGetMarkupDataForPageCompletedDelegate, userState);
5177
        }
5178
        
5027 5179
        public bool AddMarkupInfo(string project_no, KCOMDataModel.DataModel.MARKUP_INFO value) {
5028 5180
            return base.Channel.AddMarkupInfo(project_no, value);
5029 5181
        }
KCOM/Connected Services/ServiceDeepView/Reference.svcmap
28 28
    <MetadataSource Address="http://localhost:13009/ServiceDeepView.svc" Protocol="http" SourceId="1" />
29 29
  </MetadataSources>
30 30
  <Metadata>
31
    <MetadataFile FileName="ServiceDeepView.disco" MetadataType="Disco" ID="fc5736f9-e264-490b-bc6e-fd8da852f643" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?disco" />
32
    <MetadataFile FileName="ServiceDeepView8.xsd" MetadataType="Schema" ID="bb14bbbd-927d-47d4-a486-92dea8f15ded" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd3" />
33
    <MetadataFile FileName="ServiceDeepView7.xsd" MetadataType="Schema" ID="3c022930-2b91-4afb-b695-9299a0125a85" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd8" />
31 34
    <MetadataFile FileName="ServiceDeepView.xsd" MetadataType="Schema" ID="738a7870-2760-4437-bed6-3fdbf0b6b24e" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd7" />
32
    <MetadataFile FileName="ServiceDeepView1.xsd" MetadataType="Schema" ID="87878d83-f393-4daa-b939-560b2c741822" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd4" />
33 35
    <MetadataFile FileName="ServiceDeepView2.xsd" MetadataType="Schema" ID="b0c8dacb-3a4b-42dc-aea5-e95e70d2474d" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd2" />
34
    <MetadataFile FileName="ServiceDeepView.disco" MetadataType="Disco" ID="fc5736f9-e264-490b-bc6e-fd8da852f643" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?disco" />
35
    <MetadataFile FileName="ServiceDeepView3.xsd" MetadataType="Schema" ID="ec0e4252-ab2b-4e97-b8de-5a7bf2fa73a3" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd5" />
36
    <MetadataFile FileName="ServiceDeepView4.xsd" MetadataType="Schema" ID="dfb0ae11-ed51-4741-9562-826be6bdbf64" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd1" />
36
    <MetadataFile FileName="ServiceDeepView1.wsdl" MetadataType="Wsdl" ID="8a3f9301-f57c-465f-9075-5a7415a7a20c" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?wsdl" />
37 37
    <MetadataFile FileName="ServiceDeepView.wsdl" MetadataType="Wsdl" ID="42dc8791-2446-4bbc-912e-6c75b122c3db" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?wsdl=wsdl0" />
38
    <MetadataFile FileName="ServiceDeepView5.xsd" MetadataType="Schema" ID="2e9c2797-320d-4fc7-aaf9-5d764d26fb5f" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd6" />
38
    <MetadataFile FileName="ServiceDeepView99.xsd" MetadataType="Schema" ID="4ff6f1f8-cf3c-4d86-b463-5d4102cebc3e" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd9" />
39 39
    <MetadataFile FileName="ServiceDeepView6.xsd" MetadataType="Schema" ID="0a7a31d5-807b-490c-88e6-7357025a4757" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd0" />
40
    <MetadataFile FileName="ServiceDeepView1.wsdl" MetadataType="Wsdl" ID="8a3f9301-f57c-465f-9075-5a7415a7a20c" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?wsdl" />
41
    <MetadataFile FileName="ServiceDeepView7.xsd" MetadataType="Schema" ID="3c022930-2b91-4afb-b695-9299a0125a85" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd8" />
42
    <MetadataFile FileName="ServiceDeepView8.xsd" MetadataType="Schema" ID="bb14bbbd-927d-47d4-a486-92dea8f15ded" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd3" />
40
    <MetadataFile FileName="ServiceDeepView5.xsd" MetadataType="Schema" ID="2e9c2797-320d-4fc7-aaf9-5d764d26fb5f" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd6" />
41
    <MetadataFile FileName="ServiceDeepView1.xsd" MetadataType="Schema" ID="87878d83-f393-4daa-b939-560b2c741822" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd4" />
42
    <MetadataFile FileName="ServiceDeepView4.xsd" MetadataType="Schema" ID="dfb0ae11-ed51-4741-9562-826be6bdbf64" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd1" />
43
    <MetadataFile FileName="ServiceDeepView3.xsd" MetadataType="Schema" ID="ec0e4252-ab2b-4e97-b8de-5a7bf2fa73a3" SourceId="1" SourceUrl="http://localhost:13009/ServiceDeepView.svc?xsd=xsd5" />
43 44
  </Metadata>
44 45
  <Extensions>
45 46
    <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
KCOM/Connected Services/ServiceDeepView/ServiceDeepView.wsdl
11 11
      <xsd:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd6" namespace="http://schemas.datacontract.org/2004/07/System.Windows" />
12 12
      <xsd:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd7" namespace="http://schemas.datacontract.org/2004/07/IFinalPDF" />
13 13
      <xsd:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd8" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
14
      <xsd:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd9" namespace="http://schemas.datacontract.org/2004/07/KCOM_API" />
14 15
    </xsd:schema>
15 16
  </wsdl:types>
16 17
  <wsdl:message name="ServiceDeepView_GetVersionData_InputMessage">
......
235 236
  <wsdl:message name="ServiceDeepView_GetMarkupDataListperPage_OutputMessage">
236 237
    <wsdl:part name="parameters" element="GetMarkupDataListperPageResponse" />
237 238
  </wsdl:message>
239
  <wsdl:message name="ServiceDeepView_GetMarkupDataForPage_InputMessage">
240
    <wsdl:part name="parameters" element="GetMarkupDataForPage" />
241
  </wsdl:message>
242
  <wsdl:message name="ServiceDeepView_GetMarkupDataForPage_OutputMessage">
243
    <wsdl:part name="parameters" element="GetMarkupDataForPageResponse" />
244
  </wsdl:message>
238 245
  <wsdl:message name="ServiceDeepView_AddMarkupInfo_InputMessage">
239 246
    <wsdl:part name="parameters" element="AddMarkupInfo" />
240 247
  </wsdl:message>
......
594 601
      <wsdl:input wsaw:Action="urn:ServiceDeepView/GetMarkupDataListperPage" message="ServiceDeepView_GetMarkupDataListperPage_InputMessage" />
595 602
      <wsdl:output wsaw:Action="urn:ServiceDeepView/GetMarkupDataListperPageResponse" message="ServiceDeepView_GetMarkupDataListperPage_OutputMessage" />
596 603
    </wsdl:operation>
604
    <wsdl:operation name="GetMarkupDataForPage">
605
      <wsdl:input wsaw:Action="urn:ServiceDeepView/GetMarkupDataForPage" message="ServiceDeepView_GetMarkupDataForPage_InputMessage" />
606
      <wsdl:output wsaw:Action="urn:ServiceDeepView/GetMarkupDataForPageResponse" message="ServiceDeepView_GetMarkupDataForPage_OutputMessage" />
607
    </wsdl:operation>
597 608
    <wsdl:operation name="AddMarkupInfo">
598 609
      <wsdl:input wsaw:Action="urn:ServiceDeepView/AddMarkupInfo" message="ServiceDeepView_AddMarkupInfo_InputMessage" />
599 610
      <wsdl:output wsaw:Action="urn:ServiceDeepView/AddMarkupInfoResponse" message="ServiceDeepView_AddMarkupInfo_OutputMessage" />
KCOM/Connected Services/ServiceDeepView/ServiceDeepView1.wsdl
337 337
        <soap:body use="literal" />
338 338
      </wsdl:output>
339 339
    </wsdl:operation>
340
    <wsdl:operation name="GetMarkupDataForPage">
341
      <soap:operation soapAction="urn:ServiceDeepView/GetMarkupDataForPage" style="document" />
342
      <wsdl:input>
343
        <soap:body use="literal" />
344
      </wsdl:input>
345
      <wsdl:output>
346
        <soap:body use="literal" />
347
      </wsdl:output>
348
    </wsdl:operation>
340 349
    <wsdl:operation name="AddMarkupInfo">
341 350
      <soap:operation soapAction="urn:ServiceDeepView/AddMarkupInfo" style="document" />
342 351
      <wsdl:input>
KCOM/Connected Services/ServiceDeepView/ServiceDeepView6.xsd
5 5
  <xs:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd6" namespace="http://schemas.datacontract.org/2004/07/System.Windows" />
6 6
  <xs:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd7" namespace="http://schemas.datacontract.org/2004/07/IFinalPDF" />
7 7
  <xs:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd8" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
8
  <xs:import schemaLocation="http://localhost:13009/ServiceDeepView.svc?xsd=xsd9" namespace="http://schemas.datacontract.org/2004/07/KCOM_API" />
8 9
  <xs:element name="GetVersionData">
9 10
    <xs:complexType>
10 11
      <xs:sequence>
......
580 581
      </xs:sequence>
581 582
    </xs:complexType>
582 583
  </xs:element>
584
  <xs:element name="GetMarkupDataForPage">
585
    <xs:complexType>
586
      <xs:sequence>
587
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
588
        <xs:element minOccurs="0" name="_markupinfoid" nillable="true" type="xs:string" />
589
        <xs:element minOccurs="0" name="_pageNo" type="xs:int" />
590
      </xs:sequence>
591
    </xs:complexType>
592
  </xs:element>
593
  <xs:element name="GetMarkupDataForPageResponse">
594
    <xs:complexType>
595
      <xs:sequence>
596
        <xs:element xmlns:q32="http://schemas.datacontract.org/2004/07/KCOM_API" minOccurs="0" name="GetMarkupDataForPageResult" nillable="true" type="q32:ArrayOfMarkupKeyValue" />
597
      </xs:sequence>
598
    </xs:complexType>
599
  </xs:element>
583 600
  <xs:element name="AddMarkupInfo">
584 601
    <xs:complexType>
585 602
      <xs:sequence>
586 603
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
587
        <xs:element xmlns:q32="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q32:MARKUP_INFO" />
604
        <xs:element xmlns:q33="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q33:MARKUP_INFO" />
588 605
      </xs:sequence>
589 606
    </xs:complexType>
590 607
  </xs:element>
......
599 616
    <xs:complexType>
600 617
      <xs:sequence>
601 618
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
602
        <xs:element xmlns:q33="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q33:MARKUP_INFO_VERSION" />
619
        <xs:element xmlns:q34="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q34:MARKUP_INFO_VERSION" />
603 620
      </xs:sequence>
604 621
    </xs:complexType>
605 622
  </xs:element>
......
614 631
    <xs:complexType>
615 632
      <xs:sequence>
616 633
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
617
        <xs:element xmlns:q34="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q34:MARKUP_DATA" />
634
        <xs:element xmlns:q35="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q35:MARKUP_DATA" />
618 635
      </xs:sequence>
619 636
    </xs:complexType>
620 637
  </xs:element>
......
645 662
      <xs:sequence>
646 663
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
647 664
        <xs:element minOccurs="0" name="_id" nillable="true" type="xs:string" />
648
        <xs:element xmlns:q35="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q35:MARKUP_INFO" />
665
        <xs:element xmlns:q36="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q36:MARKUP_INFO" />
649 666
      </xs:sequence>
650 667
    </xs:complexType>
651 668
  </xs:element>
......
667 684
  <xs:element name="GetMarkupDataListResponse">
668 685
    <xs:complexType>
669 686
      <xs:sequence>
670
        <xs:element xmlns:q36="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMarkupDataListResult" nillable="true" type="q36:ArrayOfMARKUP_DATA" />
687
        <xs:element xmlns:q37="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMarkupDataListResult" nillable="true" type="q37:ArrayOfMARKUP_DATA" />
671 688
      </xs:sequence>
672 689
    </xs:complexType>
673 690
  </xs:element>
......
677 694
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
678 695
        <xs:element minOccurs="0" name="_user_id" nillable="true" type="xs:string" />
679 696
        <xs:element minOccurs="0" name="_doc_id" nillable="true" type="xs:string" />
680
        <xs:element xmlns:q37="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q37:ArrayOfMarkupInfoItem" />
697
        <xs:element xmlns:q38="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q38:ArrayOfMarkupInfoItem" />
681 698
      </xs:sequence>
682 699
    </xs:complexType>
683 700
  </xs:element>
......
694 711
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
695 712
        <xs:element minOccurs="0" name="_user_id" nillable="true" type="xs:string" />
696 713
        <xs:element minOccurs="0" name="_doc_id" nillable="true" type="xs:string" />
697
        <xs:element xmlns:q38="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q38:ArrayOfMarkupInfoItem" />
714
        <xs:element xmlns:q39="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q39:ArrayOfMarkupInfoItem" />
698 715
        <xs:element minOccurs="0" name="ProjectNo" nillable="true" type="xs:string" />
699 716
        <xs:element minOccurs="0" name="DocInfoID" nillable="true" type="xs:string" />
700 717
        <xs:element minOccurs="0" name="CreateUserID" nillable="true" type="xs:string" />
......
704 721
  <xs:element name="ConsolidateMergedPDFResponse">
705 722
    <xs:complexType>
706 723
      <xs:sequence>
707
        <xs:element xmlns:q39="http://schemas.datacontract.org/2004/07/IFinalPDF" minOccurs="0" name="ConsolidateMergedPDFResult" type="q39:FinalPDFResult" />
724
        <xs:element xmlns:q40="http://schemas.datacontract.org/2004/07/IFinalPDF" minOccurs="0" name="ConsolidateMergedPDFResult" type="q40:FinalPDFResult" />
708 725
      </xs:sequence>
709 726
    </xs:complexType>
710 727
  </xs:element>
......
714 731
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
715 732
        <xs:element minOccurs="0" name="_user_id" nillable="true" type="xs:string" />
716 733
        <xs:element minOccurs="0" name="_doc_id" nillable="true" type="xs:string" />
717
        <xs:element xmlns:q40="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q40:ArrayOfMarkupInfoItem" />
734
        <xs:element xmlns:q41="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q41:ArrayOfMarkupInfoItem" />
718 735
      </xs:sequence>
719 736
    </xs:complexType>
720 737
  </xs:element>
......
736 753
  <xs:element name="GetMemberResponse">
737 754
    <xs:complexType>
738 755
      <xs:sequence>
739
        <xs:element xmlns:q41="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMemberResult" nillable="true" type="q41:MEMBER" />
756
        <xs:element xmlns:q42="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMemberResult" nillable="true" type="q42:MEMBER" />
740 757
      </xs:sequence>
741 758
    </xs:complexType>
742 759
  </xs:element>
......
750 767
  <xs:element name="GetSymbolListResponse">
751 768
    <xs:complexType>
752 769
      <xs:sequence>
753
        <xs:element xmlns:q42="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetSymbolListResult" nillable="true" type="q42:ArrayOfSYMBOL_PRIVATE" />
770
        <xs:element xmlns:q43="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetSymbolListResult" nillable="true" type="q43:ArrayOfSYMBOL_PRIVATE" />
754 771
      </xs:sequence>
755 772
    </xs:complexType>
756 773
  </xs:element>
......
762 779
  <xs:element name="GetPublicSymbolDeptListResponse">
763 780
    <xs:complexType>
764 781
      <xs:sequence>
765
        <xs:element xmlns:q43="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetPublicSymbolDeptListResult" nillable="true" type="q43:ArrayOfstring" />
782
        <xs:element xmlns:q44="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetPublicSymbolDeptListResult" nillable="true" type="q44:ArrayOfstring" />
766 783
      </xs:sequence>
767 784
    </xs:complexType>
768 785
  </xs:element>
......
776 793
  <xs:element name="GetPublicSymbolListResponse">
777 794
    <xs:complexType>
778 795
      <xs:sequence>
779
        <xs:element xmlns:q44="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPublicSymbolListResult" nillable="true" type="q44:ArrayOfSYMBOL_PUBLIC" />
796
        <xs:element xmlns:q45="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPublicSymbolListResult" nillable="true" type="q45:ArrayOfSYMBOL_PUBLIC" />
780 797
      </xs:sequence>
781 798
    </xs:complexType>
782 799
  </xs:element>
......
851 868
  <xs:element name="GetPreRevSelectResponse">
852 869
    <xs:complexType>
853 870
      <xs:sequence>
854
        <xs:element xmlns:q45="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPreRevSelectResult" nillable="true" type="q45:ArrayOfDOCUMENT_ITEM" />
871
        <xs:element xmlns:q46="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPreRevSelectResult" nillable="true" type="q46:ArrayOfDOCUMENT_ITEM" />
855 872
      </xs:sequence>
856 873
    </xs:complexType>
857 874
  </xs:element>
......
866 883
  <xs:element name="GetDocInfoOneSelectResponse">
867 884
    <xs:complexType>
868 885
      <xs:sequence>
869
        <xs:element xmlns:q46="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetDocInfoOneSelectResult" nillable="true" type="q46:DOCINFO" />
886
        <xs:element xmlns:q47="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetDocInfoOneSelectResult" nillable="true" type="q47:DOCINFO" />
870 887
      </xs:sequence>
871 888
    </xs:complexType>
872 889
  </xs:element>
......
875 892
      <xs:sequence>
876 893
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
877 894
        <xs:element minOccurs="0" name="doc_id" nillable="true" type="xs:string" />
878
        <xs:element xmlns:q47="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="_markupInfoList" nillable="true" type="q47:ArrayOfMarkupInfoItem" />
895
        <xs:element xmlns:q48="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="_markupInfoList" nillable="true" type="q48:ArrayOfMarkupInfoItem" />
879 896
      </xs:sequence>
880 897
    </xs:complexType>
881 898
  </xs:element>
882 899
  <xs:element name="GetPrintDocItemListResponse">
883 900
    <xs:complexType>
884 901
      <xs:sequence>
885
        <xs:element xmlns:q48="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetPrintDocItemListResult" nillable="true" type="q48:ArrayOfMarkupInfoItem" />
902
        <xs:element xmlns:q49="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetPrintDocItemListResult" nillable="true" type="q49:ArrayOfMarkupInfoItem" />
886 903
      </xs:sequence>
887 904
    </xs:complexType>
888 905
  </xs:element>
......
890 907
    <xs:complexType>
891 908
      <xs:sequence>
892 909
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
893
        <xs:element xmlns:q49="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q49:TALK" />
910
        <xs:element xmlns:q50="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q50:TALK" />
894 911
      </xs:sequence>
895 912
    </xs:complexType>
896 913
  </xs:element>
......
912 929
  <xs:element name="GetMessageResponse">
913 930
    <xs:complexType>
914 931
      <xs:sequence>
915
        <xs:element xmlns:q50="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMessageResult" nillable="true" type="q50:ArrayOfTALK" />
932
        <xs:element xmlns:q51="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMessageResult" nillable="true" type="q51:ArrayOfTALK" />
916 933
      </xs:sequence>
917 934
    </xs:complexType>
918 935
  </xs:element>
......
927 944
  <xs:element name="FinalPDF_GetDocinfoResponse">
928 945
    <xs:complexType>
929 946
      <xs:sequence>
930
        <xs:element xmlns:q51="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetDocinfoResult" nillable="true" type="q51:DOCINFO" />
947
        <xs:element xmlns:q52="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetDocinfoResult" nillable="true" type="q52:DOCINFO" />
931 948
      </xs:sequence>
932 949
    </xs:complexType>
933 950
  </xs:element>
......
942 959
  <xs:element name="FinalPDF_GetDocumentItemResponse">
943 960
    <xs:complexType>
944 961
      <xs:sequence>
945
        <xs:element xmlns:q52="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetDocumentItemResult" nillable="true" type="q52:DOCUMENT_ITEM" />
962
        <xs:element xmlns:q53="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetDocumentItemResult" nillable="true" type="q53:DOCUMENT_ITEM" />
946 963
      </xs:sequence>
947 964
    </xs:complexType>
948 965
  </xs:element>
......
957 974
  <xs:element name="FinalPDF_GetMarkupdataResponse">
958 975
    <xs:complexType>
959 976
      <xs:sequence>
960
        <xs:element xmlns:q53="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetMarkupdataResult" nillable="true" type="q53:ArrayOfMARKUP_DATA" />
977
        <xs:element xmlns:q54="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetMarkupdataResult" nillable="true" type="q54:ArrayOfMARKUP_DATA" />
961 978
      </xs:sequence>
962 979
    </xs:complexType>
963 980
  </xs:element>
......
972 989
  <xs:element name="FinalPDF_GetMarkupinfoResponse">
973 990
    <xs:complexType>
974 991
      <xs:sequence>
975
        <xs:element xmlns:q54="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetMarkupinfoResult" nillable="true" type="q54:MARKUP_INFO" />
992
        <xs:element xmlns:q55="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetMarkupinfoResult" nillable="true" type="q55:MARKUP_INFO" />
976 993
      </xs:sequence>
977 994
    </xs:complexType>
978 995
  </xs:element>
......
986 1003
  <xs:element name="FinalPDF_GetFinalPDFsResponse">
987 1004
    <xs:complexType>
988 1005
      <xs:sequence>
989
        <xs:element xmlns:q55="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetFinalPDFsResult" nillable="true" type="q55:ArrayOfFINAL_PDF" />
1006
        <xs:element xmlns:q56="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetFinalPDFsResult" nillable="true" type="q56:ArrayOfFINAL_PDF" />
990 1007
      </xs:sequence>
991 1008
    </xs:complexType>
992 1009
  </xs:element>
......
1001 1018
  <xs:element name="FinalPDF_GetDocpageResponse">
1002 1019
    <xs:complexType>
1003 1020
      <xs:sequence>
1004
        <xs:element xmlns:q56="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetDocpageResult" nillable="true" type="q56:ArrayOfDOCPAGE" />
1021
        <xs:element xmlns:q57="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetDocpageResult" nillable="true" type="q57:ArrayOfDOCPAGE" />
1005 1022
      </xs:sequence>
1006 1023
    </xs:complexType>
1007 1024
  </xs:element>
......
1009 1026
    <xs:complexType>
1010 1027
      <xs:sequence>
1011 1028
        <xs:element minOccurs="0" name="final_id" nillable="true" type="xs:string" />
1012
        <xs:element xmlns:q57="http://schemas.datacontract.org/2004/07/IFinalPDF" minOccurs="0" name="status" type="q57:FinalStatus" />
1029
        <xs:element xmlns:q58="http://schemas.datacontract.org/2004/07/IFinalPDF" minOccurs="0" name="status" type="q58:FinalStatus" />
1013 1030
      </xs:sequence>
1014 1031
    </xs:complexType>
1015 1032
  </xs:element>
......
1093 1110
  <xs:element name="FinalPDF_GetCommentMemberResponse">
1094 1111
    <xs:complexType>
1095 1112
      <xs:sequence>
1096
        <xs:element xmlns:q58="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetCommentMemberResult" nillable="true" type="q58:MEMBER" />
1113
        <xs:element xmlns:q59="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetCommentMemberResult" nillable="true" type="q59:MEMBER" />
1097 1114
      </xs:sequence>
1098 1115
    </xs:complexType>
1099 1116
  </xs:element>
......
1107 1124
  <xs:element name="FinalPDF_GetPropertiesResponse">
1108 1125
    <xs:complexType>
1109 1126
      <xs:sequence>
1110
        <xs:element xmlns:q59="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetPropertiesResult" nillable="true" type="q59:ArrayOfPROPERTIES" />
1127
        <xs:element xmlns:q60="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="FinalPDF_GetPropertiesResult" nillable="true" type="q60:ArrayOfPROPERTIES" />
1111 1128
      </xs:sequence>
1112 1129
    </xs:complexType>
1113 1130
  </xs:element>
KCOM/Connected Services/ServiceDeepView/ServiceDeepView8.xsd
171 171
          <xs:element minOccurs="0" name="NAME" nillable="true" type="xs:string" />
172 172
          <xs:element minOccurs="0" name="PASSWORD" nillable="true" type="xs:string" />
173 173
          <xs:element minOccurs="0" name="POSITION" nillable="true" type="xs:string" />
174
          <xs:element minOccurs="0" name="PROJECT_NO" nillable="true" type="xs:string" />
174 175
          <xs:element minOccurs="0" name="SIGN_INFO" nillable="true" type="tns:ArrayOfSIGN_INFO" />
175 176
        </xs:sequence>
176 177
      </xs:extension>
KCOM/Connected Services/ServiceDeepView/ServiceDeepView99.xsd
1
<?xml version="1.0" encoding="utf-8"?>
2
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/KCOM_API" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/KCOM_API" xmlns:xs="http://www.w3.org/2001/XMLSchema">
3
  <xs:complexType name="ArrayOfMarkupKeyValue">
4
    <xs:sequence>
5
      <xs:element minOccurs="0" maxOccurs="unbounded" name="MarkupKeyValue" nillable="true" type="tns:MarkupKeyValue" />
6
    </xs:sequence>
7
  </xs:complexType>
8
  <xs:element name="ArrayOfMarkupKeyValue" nillable="true" type="tns:ArrayOfMarkupKeyValue" />
9
  <xs:complexType name="MarkupKeyValue">
10
    <xs:sequence>
11
      <xs:element minOccurs="0" name="Data" nillable="true" type="xs:string" />
12
      <xs:element minOccurs="0" name="ID" nillable="true" type="xs:string" />
13
    </xs:sequence>
14
  </xs:complexType>
15
  <xs:element name="MarkupKeyValue" nillable="true" type="tns:MarkupKeyValue" />
16
</xs:schema>
KCOM/Controls/PrintControl.xaml
118 118
                <Grid.RowDefinitions>
119 119
                    <RowDefinition Height="100"/>
120 120
                    <RowDefinition Height="60"/>
121
                    <RowDefinition Height="60"/>
121 122
                    <RowDefinition Height="80"/>
122 123
                    <RowDefinition Height="80"/>
123 124
                    <RowDefinition Height="7*"/>
......
166 167

  
167 168
                    </Grid>
168 169
                </telerik:GroupBox>
170
                <telerik:GroupBox x:Name="Selected_PEMSS" telerik:StyleManager.Theme="Office2016" Grid.Row="1" Header="Selected PEMSS" Margin="3">
171
                    <Grid>
172
                        <Grid.ColumnDefinitions>
173
                            <ColumnDefinition/>
174
                            <ColumnDefinition/>
175
                        </Grid.ColumnDefinitions>
176
                        <StackPanel Orientation="Horizontal">
177
                            <TextBlock Text="정합성 Comment 출력" VerticalAlignment="Center"/>
178
                            <CheckBox VerticalAlignment="Center" Margin="10,0" x:Name="IsRequirement"/>
179
                        </StackPanel>
180
                        <StackPanel Orientation="Horizontal" Grid.Column="1">
181
                            <TextBlock Text="Bidders Comment 출력" VerticalAlignment="Center"/>
182
                            <CheckBox VerticalAlignment="Center" Margin="10,0" x:Name="IsBidders"/>
183
                        </StackPanel>
184
                    </Grid>
185
                </telerik:GroupBox>
169 186
                <!--프린트 범위-->
170
                <telerik:GroupBox x:Name="Selected_Print" telerik:StyleManager.Theme="Office2016" Grid.Row="1" Header="Selected Print" Margin="3">
187
                <telerik:GroupBox x:Name="Selected_Print" telerik:StyleManager.Theme="Office2016" Grid.Row="2" Header="Selected Print" Margin="3">
171 188
                    <Grid>
172 189
                        <telerik:RadComboBox x:Name="cbPrint" Width="300" telerik:StyleManager.Theme="Office2016" HorizontalAlignment="Left"></telerik:RadComboBox>
173 190
                    </Grid>
174 191
                </telerik:GroupBox>
175 192

  
176
                <telerik:GroupBox telerik:StyleManager.Theme="Office2016" Grid.Row="2" Header="Print Range" Margin="3">
193
                <telerik:GroupBox telerik:StyleManager.Theme="Office2016" Grid.Row="3" Header="Print Range" Margin="3">
177 194
                    <Grid x:Name="rangeView">
178 195
                        <!--Current Grid Start-->
179 196
                        <Grid Name="GridCurrentPage" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,0"
......
258 275
                </telerik:GroupBox>
259 276
                <!--프린트 범위-->
260 277

  
261
                <telerik:GroupBox telerik:StyleManager.Theme="Office2016" Grid.Row="3" Margin="3" Header="Commented Pages(Click To Select Page)">
278
                <telerik:GroupBox telerik:StyleManager.Theme="Office2016" Grid.Row="4" Margin="3" Header="Commented Pages(Click To Select Page)">
262 279
                    <ListBox telerik:StyleManager.Theme="Office2016" x:Name="CommentPageList" Foreground="Black"  
263 280
                                     ScrollViewer.HorizontalScrollBarVisibility="Auto"
264 281
                                     SelectionChanged="CommentPageList_SelectionChanged">
......
278 295
                    </ListBox>
279 296
                </telerik:GroupBox>
280 297

  
281
                <Border Grid.Row="4" Margin="3">
298
                <Border Grid.Row="5" Margin="3">
282 299
                    <Grid>
283 300
                        <Grid.RowDefinitions>
284 301
                            <RowDefinition Height="8.5*"/>
......
366 383
                                          BorderThickness="0"
367 384
                                          BusyContent="Printing. . ."
368 385
                                          IsBusy="False"
369
                                          telerik:StyleManager.Theme="Office2016" />
386
                                          telerik:StyleManager.Theme="Office2016"/>
370 387
    </Grid>
371 388
</UserControl>
KCOM/Controls/PrintControl.xaml.cs
108 108
        DefinedPages _definePages = null; //인쇄 설정 범위 지정
109 109
        public bool IsPrint { get; set; }
110 110

  
111
        private List<PemssService.Requirement> requirementList = new List<PemssService.Requirement>();
112

  
111 113
        PrintDocument printDocument = new PrintDocument(); //프린터도큐먼트 생성
112 114

  
113 115
        //LayerControl LayerControl = null; // 레이어 컨트롤
......
256 258
                btnWholeExport.Visibility = Visibility.Collapsed;
257 259
            }
258 260

  
261
            var pemssServiceClient = new PemssService.PemssServiceClient(App._binding, App._PemssEndPoint);
262
            var result = pemssServiceClient.GetrequirementListAsync(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID).ConfigureAwait(false);
263

  
264
            requirementList = result.GetAwaiter().GetResult();
265

  
259 266
            _initializeComponentFinished = true;
260 267

  
261 268
            //timm.Interval = 10;
......
433 440
                        printCanvas.Width = image.Width;
434 441
                        printCanvas.Height = image.Height;
435 442

  
443
                        List<string> removeMarkupItems = new List<string>();
444

  
436 445
                        foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>())
437 446
                        {
447
                            if (IsRequirement.IsChecked != true)
448
                            {
449
                                removeMarkupItems =requirementList.SelectMany(x => x.VpComments.SelectMany(c => c.commentId.Split(','))).ToList();
450
                            }
451

  
438 452
                            load.User_Id = info.UserID;
439 453
                            load.document_id = _DocInfo.DOCUMENT_ID;
440 454
                            load.Page_No = PageNo;
441 455
                            load.DisplayColor = info.DisplayColor;
442 456
                            load.Markupinfoid = info.MarkupInfoID;
443
                            load.Markup_Load(printCanvas);
457
                            load.Markup_Load(printCanvas, removeMarkupItems);
444 458
                        }
445 459

  
446 460
                        printCanvas.UpdateLayout();
KCOM/Events/Load.cs
42 42
        }
43 43

  
44 44
        //마크업 불러오기
45
        public void Markup_Load(Canvas printCanvas)
45
        public void Markup_Load(Canvas printCanvas,List<string> removeId)
46 46
        {
47
            List<string> markupdata = new List<string>();
47
            if (removeId == null)
48
            {
49
                removeId = new List<string>();
50
            }
51

  
52

  
53
            List<ServiceDeepView.MarkupKeyValue> markupdata = new List<ServiceDeepView.MarkupKeyValue>();
48 54

  
49 55
            Logger.sendReqLog("GetMarkupDataListperPage: ", App.ViewInfo.ProjectNO + "," + Markupinfoid + "," + Page_No, 1);       
50
            markupdata = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupDataListperPage(App.ViewInfo.ProjectNO, Markupinfoid, Page_No);
56
            markupdata = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupDataForPage(App.ViewInfo.ProjectNO, Markupinfoid, Page_No);
51 57

  
52 58
            if (markupdata.Count() > 0)
53 59
            {
......
58 64
                Logger.sendResLog("GetMarkupDataListperPage", "FALSE", 1);
59 65
            }
60 66

  
61
            foreach (string data in markupdata)
62
            {                
63
                MarkupParser.Parse(App.ViewInfo.ProjectNO, data, printCanvas, DisplayColor, "");
67
            foreach (var data in markupdata)
68
            {
69
                if (!removeId.Contains(data.ID))
70
                {
71
                    MarkupParser.Parse(App.ViewInfo.ProjectNO, data.Data, printCanvas, DisplayColor, "");
72
                }
64 73
            }
65 74
        }
66 75
    }
KCOM/Extensions/CollectionExtenstions.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Linq.Expressions;
5
using System.Text;
6
using System.Threading.Tasks;
7

  
8
namespace KCOM
9
{
10
    public static class CollectionExtensions
11
    {
12
        //public static void Update<T>(this IList<T> source,IList<T> Target,IList<string> Keys)
13
        //{
14
        //    for (int i = source.Count; i == 0 ; --i)
15
        //    {
16
        //        var item = source[i];
17
        //         Target.Where(f=>)
18
        //        item.GetType().GetProperty()
19
        //    }
20
        //}
21

  
22
        public static T ChangeValues<T>(T item, T newitem)
23
        {
24
            var changeProp = item.GetType().GetProperties();
25
            var newProp = newitem.GetType().GetProperties();
26

  
27
            foreach (var Prop in changeProp)
28
            {
29

  
30
                var newinfo = newProp.Where(x => x.Name == Prop.Name);
31

  
32
                if (newinfo.Count() > 0)
33
                {
34
                    Prop.SetValue(item, newinfo.First().GetValue(newitem));
35
                }
36
            }
37

  
38
            return item;
39
        }
40

  
41
        /// <summary>
42
        /// Changes all elements of IEnumerable by the change function
43
        /// </summary>
44
        /// <param name="enumerable">The enumerable where you want to change stuff</param>
45
        /// <param name="change">The way you want to change the stuff</param>
46
        /// <returns>An IEnumerable with all changes applied</returns>
47
        public static IEnumerable<T> Change<T>(this IEnumerable<T> enumerable, Func<T, T> change)
48
        {
49
            ArgumentCheck.IsNullorWhiteSpace(enumerable, "enumerable");
50
            ArgumentCheck.IsNullorWhiteSpace(change, "change");
51

  
52
            foreach (var item in enumerable)
53
            {
54
                yield return change(item);
55
            }
56
        }
57

  
58
        /// <summary>
59
        /// Changes all elements of IEnumerable by the change function, that fullfill the where function
60
        /// </summary>
61
        /// <param name="enumerable">The enumerable where you want to change stuff</param>
62
        /// <param name="change">The way you want to change the stuff</param>
63
        /// <param name="where">The function to check where changes should be made</param>
64
        /// <returns>
65
        /// An IEnumerable with all changes applied
66
        /// </returns>
67
        public static IEnumerable<T> ChangeWhere<T>(this IEnumerable<T> enumerable,
68
                                                    Func<T, T> change,
69
                                                    Func<T, bool> @where)
70
        {
71
            ArgumentCheck.IsNullorWhiteSpace(enumerable, "enumerable");
72
            ArgumentCheck.IsNullorWhiteSpace(change, "change");
73
            ArgumentCheck.IsNullorWhiteSpace(@where, "where");
74

  
75
            foreach (var item in enumerable)
76
            {
77
                if (@where(item))
78
                {
79
                    yield return change(item);
80
                }
81
                else
82
                {
83
                    yield return item;
84
                }
85
            }
86
        }
87

  
88
        public static class ArgumentCheck
89
        {
90

  
91

  
92
            /// <summary>
93
            /// Checks if a value is string or any other object if it is string
94
            /// it checks for nullorwhitespace otherwhise it checks for null only
95
            /// </summary>
96
            /// <typeparam name="T">Type of the item you want to check</typeparam>
97
            /// <param name="item">The item you want to check</param>
98
            /// <param name="nameOfTheArgument">Name of the argument</param>
99
            public static void IsNullorWhiteSpace<T>(T item, string nameOfTheArgument = "")
100
            {
101

  
102
                Type type = typeof(T);
103
                if (type == typeof(string) ||
104
                    type == typeof(String))
105
                {
106
                    if (string.IsNullOrWhiteSpace(item as string))
107
                    {
108
                        throw new ArgumentException(nameOfTheArgument + " is null or Whitespace");
109
                    }
110
                }
111
                else
112
                {
113
                    if (item == null)
114
                    {
115
                        throw new ArgumentException(nameOfTheArgument + " is null");
116
                    }
117
                }
118

  
119
            }
120
        }
121

  
122
        /// <summary>
123
        /// Changes all elements of IEnumerable by the change function that do not fullfill the except function
124
        /// </summary>
125
        /// <param name="enumerable">The enumerable where you want to change stuff</param>
126
        /// <param name="change">The way you want to change the stuff</param>
127
        /// <param name="where">The function to check where changes should not be made</param>
128
        /// <returns>
129
        /// An IEnumerable with all changes applied
130
        /// </returns>
131
        public static IEnumerable<T> ChangeExcept<T>(this IEnumerable<T> enumerable,
132
                                                     Func<T, T> change,
133
                                                     Func<T, bool> @where)
134
        {
135
            ArgumentCheck.IsNullorWhiteSpace(enumerable, "enumerable");
136
            ArgumentCheck.IsNullorWhiteSpace(change, "change");
137
            ArgumentCheck.IsNullorWhiteSpace(@where, "where");
138

  
139
            foreach (var item in enumerable)
140
            {
141
                if (!@where(item))
142
                {
143
                    yield return change(item);
144
                }
145
                else
146
                {
147
                    yield return item;
148
                }
149
            }
150
        }
151

  
152
        /// <summary>
153
        /// Update all elements of IEnumerable by the update function (only works with reference types)
154
        /// </summary>
155
        /// <param name="enumerable">The enumerable where you want to change stuff</param>
156
        /// <param name="update">The way you want to change the stuff</param>
157
        /// <returns>
158
        /// The same enumerable you passed in
159
        /// </returns>
160
        public static IEnumerable<T> Update<T>(this IEnumerable<T> enumerable,
161
                                               Action<T> update) where T : class
162
        {
163
            ArgumentCheck.IsNullorWhiteSpace(enumerable, "enumerable");
164
            ArgumentCheck.IsNullorWhiteSpace(update, "update");
165
            foreach (var item in enumerable)
166
            {
167
                update(item);
168
            }
169
            return enumerable;
170
        }
171

  
172
        /// <summary>
173
        /// Update all elements of IEnumerable by the update function (only works with reference types)
174
        /// where the where function returns true
175
        /// </summary>
176
        /// <param name="enumerable">The enumerable where you want to change stuff</param>
177
        /// <param name="update">The way you want to change the stuff</param>
178
        /// <param name="where">The function to check where updates should be made</param>
179
        /// <returns>
180
        /// The same enumerable you passed in
181
        /// </returns>
182
        public static IEnumerable<T> UpdateWhere<T>(this IEnumerable<T> enumerable,
183
                                               Action<T> update, Func<T, bool> where) where T : class
184
        {
185
            ArgumentCheck.IsNullorWhiteSpace(enumerable, "enumerable");
186
            ArgumentCheck.IsNullorWhiteSpace(update, "update");
187
            foreach (var item in enumerable)
188
            {
189
                if (where(item))
190
                {
191
                    update(item);
192
                }
193
            }
194
            return enumerable;
195
        }
196

  
197
        /// <summary>
198
        /// Update all elements of IEnumerable by the update function (only works with reference types)
199
        /// Except the elements from the where function
200
        /// </summary>
201
        /// <param name="enumerable">The enumerable where you want to change stuff</param>
202
        /// <param name="update">The way you want to change the stuff</param>
203
        /// <param name="where">The function to check where changes should not be made</param>
204
        /// <returns>
205
        /// The same enumerable you passed in
206
        /// </returns>
207
        public static IEnumerable<T> UpdateExcept<T>(this IEnumerable<T> enumerable,
208
                                               Action<T> update, Func<T, bool> where) where T : class
209
        {
210
            ArgumentCheck.IsNullorWhiteSpace(enumerable, "enumerable");
211
            ArgumentCheck.IsNullorWhiteSpace(update, "update");
212

  
213
            foreach (var item in enumerable)
214
            {
215
                if (!where(item))
216
                {
217
                    update(item);
218
                }
219
            }
220
            return enumerable;
221
        }
222
    }
223
}
KCOM/Extensions/VectorExtentions.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Text;
5
using System.Threading.Tasks;
6
using System.Windows;
7

  
8
namespace KCOM
9
{
10
    public static class VectorExtentions
11
    {
12
        public static Point Rotate(this Point pt, double angle, Point center)
13
        {
14
            Vector v = new Vector(pt.X - center.X, pt.Y - center.Y).Rotate(angle);
15
            return new Point(v.X + center.X, v.Y + center.Y);
16
        }
17

  
18
        public static Vector Rotate(this Vector v, double degrees)
19
        {
20
            return v.RotateRadians(degrees * Math.PI / 180);
21
        }
22

  
23
        public static Vector RotateRadians(this Vector v, double radians)
24
        {
25
            double ca = Math.Cos(radians);
26
            double sa = Math.Sin(radians);
27
            return new Vector(ca * v.X - sa * v.Y, sa * v.X + ca * v.Y);
28
        }
29
    }
30
}
KCOM/KCOM.csproj
291 291
      <DependentUpon>addToFavoriteWindow_Internal.xaml</DependentUpon>
292 292
    </Compile>
293 293
    <Compile Include="Converters\StringMultiLineConvert.cs" />
294
    <Compile Include="Extensions\CollectionExtenstions.cs" />
295
    <Compile Include="Extensions\VectorExtentions.cs" />
294 296
    <Compile Include="Views\AddRequirement.xaml.cs">
295 297
      <DependentUpon>AddRequirement.xaml</DependentUpon>
296 298
    </Compile>
......
608 610
    <None Include="Connected Services\ServiceDeepView\KCOM.ServiceDeepView.FinalPDFResult.datasource">
609 611
      <DependentUpon>Reference.svcmap</DependentUpon>
610 612
    </None>
613
    <None Include="Connected Services\ServiceDeepView\KCOM.ServiceDeepView.MarkupKeyValue.datasource">
614
      <DependentUpon>Reference.svcmap</DependentUpon>
615
    </None>
611 616
    <None Include="Connected Services\ServiceDeepView\ServiceDeepView.wsdl" />
612 617
    <None Include="Connected Services\ServiceDeepView\ServiceDeepView.xsd">
613 618
      <SubType>Designer</SubType>
......
666 671
    <None Include="Connected Services\ServiceDeepView\ServiceDeepView98.xsd">
667 672
      <SubType>Designer</SubType>
668 673
    </None>
674
    <None Include="Connected Services\ServiceDeepView\ServiceDeepView99.xsd">
675
      <SubType>Designer</SubType>
676
    </None>
669 677
    <None Include="MARKUS.ini" />
670 678
    <None Include="packages.config">
671 679
      <SubType>Designer</SubType>
KCOM/Properties/DataSources/KCOMDataModel.DataModel.DOCPAGE.datasource
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--
3
    This file is automatically generated by Visual Studio .Net. It is 
4
    used to store generic object data source configuration information.  
5
    Renaming the file extension or editing the content of this file may   
6
    cause the file to be unrecognizable by the program.
7
-->
8
<GenericObjectDataSource DisplayName="DOCPAGE" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
9
   <TypeInfo>KCOMDataModel.DataModel.DOCPAGE, KCOMDataModel, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
10
</GenericObjectDataSource>
KCOM/Properties/DataSources/KCOMDataModel.DataModel.FINAL_PDF.datasource
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--
3
    This file is automatically generated by Visual Studio .Net. It is 
4
    used to store generic object data source configuration information.  
5
    Renaming the file extension or editing the content of this file may   
6
    cause the file to be unrecognizable by the program.
7
-->
8
<GenericObjectDataSource DisplayName="FINAL_PDF" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
9
   <TypeInfo>KCOMDataModel.DataModel.FINAL_PDF, KCOMDataModel, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
10
</GenericObjectDataSource>
KCOM/Properties/DataSources/KCOMDataModel.DataModel.PROPERTIES.datasource
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--
3
    This file is automatically generated by Visual Studio .Net. It is 
4
    used to store generic object data source configuration information.  
5
    Renaming the file extension or editing the content of this file may   
6
    cause the file to be unrecognizable by the program.
7
-->
8
<GenericObjectDataSource DisplayName="PROPERTIES" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
9
   <TypeInfo>KCOMDataModel.DataModel.PROPERTIES, KCOMDataModel, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
10
</GenericObjectDataSource>
KCOM/ViewModel/RequirementViewModel.cs
74 74
                }
75 75
            }
76 76
        }
77
        
77

  
78
        #region UI에 대한 이벤트
78 79

  
79 80
        public AsyncCommand RefreshCommand => new AsyncCommand(()=> OnGetRequirementDataAsync());
80 81

  
......
84 85

  
85 86
        public RelayCommand SelectedVPCommentCommand => new RelayCommand(x => OnSelectedVPCommentCommand(x));
86 87

  
88
        #endregion
87 89

  
88 90
        #region 초기화 및 종료 이벤트
89 91

  
......
98 100

  
99 101
                OnGetRequirementDataAsync().ConfigureAwait(false);
100 102
            }
101
            catch (Exception EX)
103
            catch (Exception ex)
102 104
            {
103 105

  
104 106
                throw;
......
118 120
        #endregion
119 121

  
120 122
        #region Command
121
        private async Task OnGetRequirementDataAsync()
123
        private async Task OnGetRequirementDataAsync(bool IsInit = true)
122 124
        {
123 125
            var result = await pemssServiceClient.GetrequirementListAsync(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID);
124 126

  
125
            requirementList.Clear();
126
            result.ForEach(x =>
127
            if (IsInit)
128
            {
129
                requirementList.Clear();
130
            }
131

  
132
            result.ForEach(newItem =>
127 133
            {
128
                x.IsExpanded = true;
129
                x.IsExpandable = false;
130
                RequirementList.Add(x);
134
                newItem.IsExpanded = true;
135
                newItem.IsExpandable = false;
136

  
137
                if (IsInit)
138
                {
139
                    RequirementList.Add(newItem);
140
                }
141
                else
142
                {
143
                    RequirementList.UpdateWhere(changeitem => CollectionExtensions.ChangeValues(changeitem, newItem), x => x.mdId == newItem.mdId);
144
                }
131 145
            });
132 146
        }
133 147

  
......
258 272
                        rect = Rect.Union(rect,instance.ItemRect);
259 273

  
260 274
                    }
261

  
275
                      
262 276
                    SelectionSet.Instance.SelectItemByRect(rect, main);
263
                    //rect.Scale(4, 4);
277

  
278

  
279
                    //var matrix = new System.Windows.Media.Matrix();
280
                    ////var CenterPoint = VectorExtentions.Rotate(new Point(centerX, centerY), Common.ViewerDataModel.Instance.Angle,
281
                    //// new Point(Common.ViewerDataModel.Instance.ImageViewWidth / 2, Common.ViewerDataModel.Instance.ImageViewHeight / 2));
282

  
283
                    ////matrix.RotateAt(Common.ViewerDataModel.Instance.Angle, Common.ViewerDataModel.Instance.ImageViewWidth/2, Common.ViewerDataModel.Instance.ImageViewHeight/2);
284

  
285
                    //matrix.Rotate(Common.ViewerDataModel.Instance.Angle);
286
                    ////if (Math.Abs(Common.ViewerDataModel.Instance.Angle) == 90)
287
                    ////{
288
                    ////    matrix.Translate(Common.ViewerDataModel.Instance.ImageViewHeight, Common.ViewerDataModel.Instance.ImageViewWidth);
289
                    ////}
290

  
291
                    //rect.Transform(matrix);
264 292

  
265 293
                    main.zoomAndPanControl.ZoomTo(rect);
266
                  //  main.zoomAndPanControl.ZoomAboutPoint(main.zoomAndPanControl.ContentScale - 0.2, contentZoomCenter);
294

  
295
                    double centerX = rect.Left + rect.Width / 2;
296
                    double centerY = rect.Top + rect.Height / 2;
297

  
298
                    main.zoomAndPanControl.ZoomAboutPoint(main.zoomAndPanControl.ContentScale/3, new Point(centerX, centerY));
267 299
                }
268 300
                catch (Exception ex)
269 301
                {
......
272 304
            }
273 305
        }
274 306

  
275
        private void OnVpCommentSelectCommand(object x)
276
        {
277
            throw new NotImplementedException();
278
        }
279

  
280

  
281 307
        private VpCommant selectedComment;
282 308

  
283 309
        private async void OnDelVPCommentWindowClosed(object sender, WindowClosedEventArgs e)
......
303 329
                    //MessageBox.Show("삭제 오류");
304 330
                }
305 331

  
306
                await OnGetRequirementDataAsync();
332
                await OnGetRequirementDataAsync(false);
307 333
            }
308 334
        }
309 335

  
......
337 363
         
338 364
                var result = await pemssServiceClient.SetRequirementCommentAsync(projectNo,docId,mdId,markupId,commentOnMarkup,condition,userId);
339 365

  
340
                await OnGetRequirementDataAsync();
366
                await OnGetRequirementDataAsync(false);
341 367
            }
342 368
        }
343 369

  
KCOM_API/KCOM_API.csproj
78 78
    </Content>
79 79
  </ItemGroup>
80 80
  <ItemGroup>
81
    <Compile Include="MarkupKeyValue.cs" />
81 82
    <Compile Include="PemssService.svc.cs">
82 83
      <DependentUpon>PemssService.svc</DependentUpon>
83 84
      <SubType>Component</SubType>
KCOM_API/MarkupKeyValue.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Runtime.Serialization;
5
using System.Web;
6

  
7
namespace KCOM_API
8
{
9
    [DataContract]
10
    public class MarkupKeyValue
11
    {
12
        [DataMember]
13
        public string ID { get; set; }
14

  
15
        [DataMember]
16
        public string Data { get; set; }
17
    }
18
}
KCOM_API/ServiceDeepView.svc.cs
1760 1760
        }
1761 1761

  
1762 1762
        [OperationContract]
1763
        public List<MarkupKeyValue> GetMarkupDataForPage(string project_no, string _markupinfoid, int _pageNo)
1764
        {
1765
            List<MarkupKeyValue> markupdata = new List<MarkupKeyValue>();
1766

  
1767
            MARKUP_INFO_VERSION markup_info_version = new MARKUP_INFO_VERSION();
1768
            try
1769
            {
1770
                using (CIEntities Entity = new CIEntities(ConnectStringBuilder.ProjectCIConnectString(project_no).ToString()))
1771
                {
1772
                    markup_info_version = (from version in Entity.MARKUP_INFO_VERSION
1773
                                           where version.MARKUPINFO_ID == _markupinfoid
1774
                                           orderby version.CREATE_DATE descending
1775
                                           select version).First();
1776

  
1777
                    markupdata = (from data in Entity.MARKUP_DATA
1778
                                  where data.MARKUPINFO_VERSION_ID == markup_info_version.ID && data.PAGENUMBER == _pageNo
1779
                                  select new MarkupKeyValue { ID = data.ID, Data = data.DATA }).ToList();
1780
                }
1781
            }
1782
            catch (Exception)
1783
            {
1784
                return null;
1785
            }
1786
            return markupdata;
1787
        }
1788

  
1789
        [OperationContract]
1763 1790
        public bool AddMarkupInfo(string project_no, MARKUP_INFO value)
1764 1791
        {
1765 1792
            try
PemssAPI/PemssApi.cs
7 7
using System.Collections.Specialized;
8 8
using System.Net.Http;
9 9
using System.Net.Http.Headers;
10
using System.Net;
11
using Newtonsoft.Json;
10 12

  
11 13
namespace KCOM_API
12 14
{
......
142 144
        /// </summary>
143 145
        /// <param name="pId">프로젝트 ID</param>
144 146
        /// <param name="dId">Document ID</param>
145
        /// <param name="mdId">MR 상세 아이템 ID</param>
147
        /// <param name="mrId">MR 상세 아이템 ID</param>
146 148
        /// <param name="commentId"></param>
147 149
        /// <param name="uId"></param>
148 150
        /// <returns></returns>
......
155 157
                //http://pemss.i-on.net/rest/ext/comment/requirement?dId=116&mdId=MD0000000352&commentId=1&uId=유저아이디
156 158

  
157 159
                var values = new NameValueCollection(){
160
                    { "pId",pId},
158 161
                    { "dId",dId},
159 162
                    { "mdId", mdId},
160 163
                    { "commentId" , commentId},
161 164
                    { "uId", uId}
162 165
                };
163 166

  
164
                var jsonObj = DeleteWebClientString($"{gPemssUri}","/rest/ext/comment/requirement", values);
165
                                    //+ $"dId={dId}&mdId={mdId}&commentId={commentId}&uId={uId}");
167
                //var jsonObj = DeleteWebClientString($"{gPemssUri}/rest/ext/comment/requirement",values);
168
                var jsonObj = DeleteWebClientString($"{gPemssUri}/rest/ext/comment/requirement?dId={dId}&mdId={mdId}&commentId={commentId}&uId={uId}", values);
169
                // + $"dId={dId}&mdId={mdId}&commentId={commentId}&uId={uId}", values);
166 170

  
167 171
                // var jsonObj = DeleteWebClientString($"{gPemssUri}/rest/ext/comment/requirement", values);
168 172

  
......
311 315
            }
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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