/ - Diff - MARKUS - 일정관리

개정판 2f07b70a

ID	2f07b70af0e2b401dd6508089035c00b2e0964e1
상위	27cf69cd
하위	e6e06e16

semi 이(가) 4년 이상 전에 추가함

chart bar 하는 중

Change-Id: Iba0e8eceec980c21c4a4495f4e6c9fb4dfcc4759

ConvertService/ServiceBase/Markus.Mvvm.ToolKit/Markus.Mvvm.ToolKit.csproj
30	30	<DefineConstants>TRACE;DEBUG</DefineConstants>
31	31	<ErrorReport>prompt</ErrorReport>
32	32	<WarningLevel>4</WarningLevel>
	33	<PlatformTarget>x64</PlatformTarget>
33	34	</PropertyGroup>
34	35	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' ">
35	36	<DebugType>pdbonly</DebugType>

     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     namespace Markus.Service.StationController.Data
+    {
         class ConvertCOUNT : INotifyPropertyChanged
+        {
             public event PropertyChangedEventHandler PropertyChanged;
             private void OnPropertyChanged(string propertyName)
+            {
                 if (PropertyChanged != null)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+            }
             public ConvertCOUNT()
+            {
+            }
             public ConvertCOUNT(string projectNO, int count)
+            {
                 Project_NO = projectNO;
                 Count = count;
+            }
             private string _Project_NO;
             public string Project_NO
+            {
                 get
+                {
                     return _Project_NO;
+                }
                 set
+                {
                     if (_Project_NO != value)
+                    {
                         _Project_NO = value;
                         OnPropertyChanged("Project_NO");
+                    }
+                }
+            }
             private int _Count;
             public int Count
+            {
                 get
+                {
                     return _Count;
+                }
                 set
+                {
                     if (_Count != value)
+                    {
                         _Count = value;
                         OnPropertyChanged("Count");
+                    }
+                }
+            }
+        }
+    }

     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     namespace Markus.Service.StationController.Data
+    {
         public class ConvertPDF : INotifyPropertyChanged
+        {
             public event PropertyChangedEventHandler PropertyChanged;
             private void OnPropertyChanged(string propertyName)
+            {
                 if (PropertyChanged != null)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+            }
             public ConvertPDF()
+            {
+            }
             public bool Equals(ConvertPDF other)
+            {
                 if (other is null)
                     return false;
                 return this.ConvertID == other.ConvertID && this.ProjectNumber == other.ProjectNumber;
+            }
             public override bool Equals(object obj) => Equals(obj as ConvertPDF);
             public override int GetHashCode()
+            {
                 var id = (ConvertID != null) ? ConvertID : "";
                 var project = (ProjectNumber != null) ? ProjectNumber : "";
                 return (id + project).GetHashCode();
+            }
             public ConvertPDF(string serviceID, string convertId, string projectNo, int Status, string documentID, string documentName, string documentNo, string document_URL,
                 string revision, int currentPageNo, int totalPage, string exception, string groupNo,
                DateTime create_datetime, DateTime? start_datetime, DateTime? end_datetime, string originfilePath, string convertPath, string markusLink, int? reconverter)
+            {
                 ServiceID = serviceID;
                 DocumentID = documentID;
                 ConvertID = convertId;
                 ProjectNumber = projectNo;
                 ConvertState = (StatusCodeType)Status;
                 UniqueKey = documentID;
                 DocumentName = documentName;
                 DocumentNo = documentNo;
                 DocumnetURL = document_URL;
                 Revision = revision;
                 CurrentPageNo = currentPageNo;
                 TotalPage = totalPage;
                 Exception = exception;
                 GroupNo = groupNo;
                 CreateTime = create_datetime;
                 StartTime = start_datetime;
                 EndTime = end_datetime;
                 ConvertPath = convertPath;
                 MarkusLink = markusLink;
                 OriginfilePath = originfilePath;
                 ReConverter = reconverter;
                 string result = "";
                 if (originfilePath.Contains("/"))
+                {
                     result = originfilePath.Substring(originfilePath.LastIndexOf("/") + 1);
+                }
                 else
+                {
                     result = originfilePath.Substring(originfilePath.LastIndexOf("%") + 1);
+                }
                 this._FileName = result;
+            }
             private string _FileName;
             public string FileName
+            {
                 get
+                {
                     return _FileName;
+                }
                 set
+                {
                     if (_FileName != value)
+                    {
                         _FileName = value;
                         OnPropertyChanged("FileName");
+                    }
+                }
+            }
             private int? _ReConverter;
             public int? ReConverter
+            {
                 get
+                {
                     return _ReConverter;
+                }
                 set
+                {
                     if (_ReConverter != value)
+                    {
                         _ReConverter = value;
                         OnPropertyChanged("ReConverter");
+                    }
+                }
+            }
             private string _OriginfilePath;
             public string OriginfilePath
+            {
                 get
+                {
                     return _OriginfilePath;
+                }
                 set
+                {
                     if (_OriginfilePath != value)
+                    {
                         _OriginfilePath = value;
                         OnPropertyChanged("OriginfilePath");
+                    }
+                }
+            }
             private string _MarkusLink;
             public string MarkusLink
+            {
                 get
+                {
                     return _MarkusLink;
+                }
                 set
+                {
                     if (_MarkusLink != value)
+                    {
                         _MarkusLink = value;
                         OnPropertyChanged("MarkusLink");
+                    }
+                }
+            }
             private string _ConvertPath;
             public string ConvertPath
+            {
                 get
+                {
                     return _ConvertPath;
+                }
                 set
+                {
                     if (_ConvertPath != value)
+                    {
                         _ConvertPath = value;
                         OnPropertyChanged("ConvertPath");
+                    }
+                }
+            }
             private DateTime? _EndTime;
             public DateTime? EndTime
+            {
                 get
+                {
                     return _EndTime;
+                }
                 set
+                {
                     if (value == null)
+                    {
                         _EndTime = null;
                         OnPropertyChanged("EndTime");
+                    }
                     else if (_EndTime != value)
+                    {
                         _EndTime = value;
                         OnPropertyChanged("EndTime");
+                    }
+                }
+            }
             private DateTime? _StartTime;
             public DateTime? StartTime
+            {
                 get
+                {
                     return _StartTime;
+                }
                 set
+                {
                     if (value == null)
+                    {
                         _StartTime = null;
                         OnPropertyChanged("StartTime");
+                    }
                     else if (_StartTime != value)
+                    {
                         _StartTime = value;
                         OnPropertyChanged("StartTime");
+                    }
+                }
+            }
             private DateTime _CreateTime;
             public DateTime CreateTime
+            {
                 get
+                {
                     return _CreateTime;
+                }
                 set
+                {
                     if (_CreateTime != value)
+                    {
                         _CreateTime = value;
                         OnPropertyChanged("CreateTime");
+                    }
+                }
+            }
             private string _GroupNo;
             public string GroupNo
+            {
                 get
+                {
                     return _GroupNo;
+                }
                 set
+                {
                     if (_GroupNo != value)
+                    {
                         _GroupNo = value;
                         OnPropertyChanged("GroupNo");
+                    }
+                }
+            }
             private string _Exception;
             public string Exception
+            {
                 get
+                {
                     return _Exception;
+                }
                 set
+                {
                     if (_Exception != value)
+                    {
                         _Exception = value;
                         OnPropertyChanged("Exception");
+                    }
+                }
+            }
             private int _TotalPage;
             public int TotalPage
+            {
                 get
+                {
                     return _TotalPage;
+                }
                 set
+                {
                     if (_TotalPage != value)
+                    {
                         _TotalPage = value;
                         OnPropertyChanged("TotalPage");
+                    }
+                }
+            }
             private int _CurrentPageNo;
             public int CurrentPageNo
+            {
                 get
+                {
                     return _CurrentPageNo;
+                }
                 set
+                {
                     if (_CurrentPageNo != value)
+                    {
                         _CurrentPageNo = value;
                         OnPropertyChanged("CurrentPageNo");
+                    }
+                }
+            }
             private string _Revision;
             public string Revision
+            {
                 get
+                {
                     return _Revision;
+                }
                 set
+                {
                     if (_Revision != value)
+                    {
                         _Revision = value;
                         OnPropertyChanged("Revision");
+                    }
+                }
+            }
             private string _DocumnetURL;
             public string DocumnetURL
+            {
                 get
+                {
                     return _DocumnetURL;
+                }
                 set
+                {
                     if (_DocumnetURL != value)
+                    {
                         _DocumnetURL = value;
                         OnPropertyChanged("DocumnetURL");
+                    }
+                }
+            }
             private string _DocumentNo;
             public string DocumentNo
+            {
                 get
+                {
                     return _DocumentNo;
+                }
                 set
+                {
                     if (_DocumentNo != value)
+                    {
                         _DocumentNo = value;
                         OnPropertyChanged("DocumentNo");
+                    }
+                }
+            }
             private string _DocumentName;
             public string DocumentName
+            {
                 get
+                {
                     return _DocumentName;
+                }
                 set
+                {
                     if (_DocumentName != value)
+                    {
                         _DocumentName = value;
                         OnPropertyChanged("DocumentName");
+                    }
+                }
+            }
             private string _UniqueKey;
             public string UniqueKey
+            {
                 get
+                {
                     return _UniqueKey;
+                }
                 set
+                {
                     if (_UniqueKey != value)
+                    {
                         _UniqueKey = value;
                         OnPropertyChanged("UniqueKey");
+                    }
+                }
+            }
             private StatusCodeType _ConvertState;
             public StatusCodeType ConvertState
+            {
                 get
+                {
                     return _ConvertState;
+                }
                 set
+                {
                     if (_ConvertState != value)
+                    {
                         _ConvertState = value;
                         OnPropertyChanged("ConvertState");
+                    }
+                }
+            }
             private string _DocumentID;
             public string DocumentID
+            {
                 get
+                {
                     return _DocumentID;
+                }
                 set
+                {
                     if (_DocumentID != value)
+                    {
                         _DocumentID = value;
                         OnPropertyChanged("DocumentID");
+                    }
+                }
+            }
             private string _ConvertID;
             public string ConvertID
+            {
                 get
+                {
                     return _ConvertID;
+                }
                 set
+                {
                     if (_ConvertID != value)
+                    {
                         _ConvertID = value;
                         OnPropertyChanged("ConvertID");
+                    }
+                }
+            }
             private string _ServiceID;
             public string ServiceID
+            {
                 get
+                {
                     return _ServiceID;
+                }
                 set
+                {
                     if (_ServiceID != value)
+                    {
                         _ServiceID = value;
                         OnPropertyChanged("ServiceID");
+                    }
+                }
+            }
             private string _ProjectNumber;
             public string ProjectNumber
+            {
                 get
+                {
                     return _ProjectNumber;
+                }
                 set
+                {
                     if (_ProjectNumber != value)
+                    {
                         _ProjectNumber = value;
                         OnPropertyChanged("ProjectNumber");
+                    }
+                }
+            }
             public enum StatusCodeType
+            {
                 None = 0,
                 Wait = 1,
                 PageLoading = 2,
                 Saving = 3,
                 Completed = 4,
                 FileError = 50,
                 PageError = 55,
                 NeedsPassword = 60,
                 Error = 99,
                 All_Error = 100
+            }
+        }
+    }

     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     namespace Markus.Service.StationController.Data
+    {
         public class DataConvert : INotifyPropertyChanged
+        {
             public event PropertyChangedEventHandler PropertyChanged;
             private void OnPropertyChanged(string propertyName)
+            {
                 if (PropertyChanged != null)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+            }
             public DataConvert()
+            {
+            }
             public bool Equals(DataConvert other)
+            {
                 if (other is null)
                     return false;
                 return this.ConvertID == other.ConvertID && this.ProjectNumber == other.ProjectNumber;
+            }
             public override bool Equals(object obj) => Equals(obj as DataConvert);
             public override int GetHashCode()
+            {
                 var id = (ConvertID != null) ? ConvertID : "";
                 var project = (ProjectNumber != null) ? ProjectNumber : "";
                 return (id + project).GetHashCode();
+            }
             public DataConvert(string serviceID, string convertId, string projectNo, int Status, string documentID, string documentName, string documentNo, string document_URL, string revision, int currentPageNo, int totalPage, string exception, string groupNo,
                DateTime create_datetime, DateTime? start_datetime, DateTime? end_datetime, string originfilePath, string convertPath, string markusLink, int? reconverter)//20
+            {
                 ServiceID = serviceID;
                 DocumentID = documentID;
                 ConvertID = convertId;
                 ProjectNumber = projectNo;
                 ConvertState = (StatusCodeType)Status;
                 UniqueKey = documentID;
                 DocumentName = documentName;
                 DocumentNo = documentNo;
                 DocumnetURL = document_URL;
                 Revision = revision;
                 CurrentPageNo = currentPageNo;
                 TotalPage = totalPage;
                 Exception = exception;
                 GroupNo = groupNo;
                 CreateTime = create_datetime;
                 StartTime = start_datetime;
                 EndTime = end_datetime;
                 ConvertPath = convertPath;
                 MarkusLink = markusLink;
                 OriginfilePath = originfilePath;
                 ReConverter = reconverter;
                 string result = "";
                 if (originfilePath.Contains("/"))
+                {
                     result = originfilePath.Substring(originfilePath.LastIndexOf("/") + 1);
+                }
                 else
+                {
                     result = originfilePath.Substring(originfilePath.LastIndexOf("%") + 1);
+                }
                 this._FileName = result;
+            }
             private string _FileName;
             public string FileName
+            {
                 get
+                {
                     return _FileName;
+                }
                 set
+                {
                     if (_FileName != value)
+                    {
                         _FileName = value;
                         OnPropertyChanged("FileName");
+                    }
+                }
+            }
             private int? _ReConverter;
             public int? ReConverter
+            {
                 get
+                {
                     return _ReConverter;
+                }
                 set
+                {
                     if (_ReConverter != value)
+                    {
                         _ReConverter = value;
                         OnPropertyChanged("ReConverter");
+                    }
+                }
+            }
             private string _OriginfilePath;
             public string OriginfilePath
+            {
                 get
+                {
                     return _OriginfilePath;
+                }
                 set
+                {
                     if (_OriginfilePath != value)
+                    {
                         _OriginfilePath = value;
                         OnPropertyChanged("OriginfilePath");
+                    }
+                }
+            }
             private string _MarkusLink;
             public string MarkusLink
+            {
                 get
+                {
                     return _MarkusLink;
+                }
                 set
+                {
                     if (_MarkusLink != value)
+                    {
                         _MarkusLink = value;
                         OnPropertyChanged("MarkusLink");
+                    }
+                }
+            }
             private string _ConvertPath;
             public string ConvertPath
+            {
                 get
+                {
                     return _ConvertPath;
+                }
                 set
+                {
                     if (_ConvertPath != value)
+                    {
                         _ConvertPath = value;
                         OnPropertyChanged("ConvertPath");
+                    }
+                }
+            }
             private DateTime? _EndTime;
             public DateTime? EndTime
+            {
                 get
+                {
                     return _EndTime;
+                }
                 set
+                {
                     if (value == null)
+                    {
                         _EndTime = null;
                         OnPropertyChanged("EndTime");
+                    }
                     else if (_EndTime != value)
+                    {
                         _EndTime = value;
                         OnPropertyChanged("EndTime");
+                    }
+                }
+            }
             private DateTime? _StartTime;
             public DateTime? StartTime
+            {
                 get
+                {
                     return _StartTime;
+                }
                 set
+                {
                     if (value == null)
+                    {
                         _StartTime = null;
                         OnPropertyChanged("StartTime");
+                    }
                     else if (_StartTime != value)
+                    {
                         _StartTime = value;
                         OnPropertyChanged("StartTime");
+                    }
+                }
+            }
             private DateTime _CreateTime;
             public DateTime CreateTime
+            {
                 get
+                {
                     return _CreateTime;
+                }
                 set
+                {
                     if (_CreateTime != value)
+                    {
                         _CreateTime = value;
                         OnPropertyChanged("CreateTime");
+                    }
+                }
+            }
             private string _GroupNo;
             public string GroupNo
+            {
                 get
+                {
                     return _GroupNo;
+                }
                 set
+                {
                     if (_GroupNo != value)
+                    {
                         _GroupNo = value;
                         OnPropertyChanged("GroupNo");
+                    }
+                }
+            }
             private string _Exception;
             public string Exception
+            {
                 get
+                {
                     return _Exception;
+                }
                 set
+                {
                     if (_Exception != value)
+                    {
                         _Exception = value;
                         OnPropertyChanged("Exception");
+                    }
+                }
+            }
             private int _TotalPage;
             public int TotalPage
+            {
                 get
+                {
                     return _TotalPage;
+                }
                 set
+                {
                     if (_TotalPage != value)
+                    {
                         _TotalPage = value;
                         OnPropertyChanged("TotalPage");
+                    }
+                }
+            }
             private int _CurrentPageNo;
             public int CurrentPageNo
+            {
                 get
+                {
                     return _CurrentPageNo;
+                }
                 set
+                {
                     if (_CurrentPageNo != value)
+                    {
                         _CurrentPageNo = value;
                         OnPropertyChanged("CurrentPageNo");
+                    }
+                }
+            }
             private string _Revision;
             public string Revision
+            {
                 get
+                {
                     return _Revision;
+                }
                 set
+                {
                     if (_Revision != value)
+                    {
                         _Revision = value;
                         OnPropertyChanged("Revision");
+                    }
+                }
+            }
             private string _DocumnetURL;
             public string DocumnetURL
+            {
                 get
+                {
                     return _DocumnetURL;
+                }
                 set
+                {
                     if (_DocumnetURL != value)
+                    {
                         _DocumnetURL = value;
                         OnPropertyChanged("DocumnetURL");
+                    }
+                }
+            }
             private string _DocumentNo;
             public string DocumentNo
+            {
                 get
+                {
                     return _DocumentNo;
+                }
                 set
+                {
                     if (_DocumentNo != value)
+                    {
                         _DocumentNo = value;
                         OnPropertyChanged("DocumentNo");
+                    }
+                }
+            }
             private string _DocumentName;
             public string DocumentName
+            {
                 get
+                {
                     return _DocumentName;
+                }
                 set
+                {
                     if (_DocumentName != value)
+                    {
                         _DocumentName = value;
                         OnPropertyChanged("DocumentName");
+                    }
+                }
+            }
             private string _UniqueKey;
             public string UniqueKey
+            {
                 get
+                {
                     return _UniqueKey;
+                }
                 set
+                {
                     if (_UniqueKey != value)
+                    {
                         _UniqueKey = value;
                         OnPropertyChanged("UniqueKey");
+                    }
+                }
+            }
             private StatusCodeType _ConvertState;
             public StatusCodeType ConvertState
+            {
                 get
+                {
                     return _ConvertState;
+                }
                 set
+                {
                     if (_ConvertState != value)
+                    {
                         _ConvertState = value;
                         OnPropertyChanged("ConvertState");
+                    }
+                }
+            }
             private string _DocumentID;
             public string DocumentID
+            {
                 get
+                {
                     return _DocumentID;
+                }
                 set
+                {
                     if (_DocumentID != value)
+                    {
                         _DocumentID = value;
                         OnPropertyChanged("DocumentID");
+                    }
+                }
+            }
             private string _ConvertID;
             public string ConvertID
+            {
                 get
+                {
                     return _ConvertID;
+                }
                 set
+                {
                     if (_ConvertID != value)
+                    {
                         _ConvertID = value;
                         OnPropertyChanged("ConvertID");
+                    }
+                }
+            }
             private string _ServiceID;
             public string ServiceID
+            {
                 get
+                {
                     return _ServiceID;
+                }
                 set
+                {
                     if (_ServiceID != value)
+                    {
                         _ServiceID = value;
                         OnPropertyChanged("ServiceID");
+                    }
+                }
+            }
             private string _ProjectNumber;
             public string ProjectNumber
+            {
                 get
+                {
                     return _ProjectNumber;
+                }
                 set
+                {
                     if (_ProjectNumber != value)
+                    {
                         _ProjectNumber = value;
                         OnPropertyChanged("ProjectNumber");
+                    }
+                }
+            }
             public enum StatusCodeType
+            {
                 None = 0,
                 Wait = 1,
                 PageLoading = 2,
                 Saving = 3,
                 Completed = 4,
                 FileError = 50,
                 PageError = 55,
                 NeedsPassword = 60,
                 Error = 99,
                 All_Error = 100
+            }
+        }
+    }

                 PageLoading = 2,
                 Saving = 3,
                 Completed = 4,
                 UploadError = 5,
                 Error11 = 11,
                 FileError = 50,
                 PageError = 55,
                 NeedsPassword = 60,

         <BootstrapperEnabled>true</BootstrapperEnabled>
       </PropertyGroup>
       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <PlatformTarget>AnyCPU</PlatformTarget>
         <PlatformTarget>x64</PlatformTarget>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
-...
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\Telerik\Telerik.Windows.Controls.dll</HintPath>
         </Reference>
         <Reference Include="Telerik.Windows.Controls.Chart, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries.NoXaml\WPF45\Telerik.Windows.Controls.Chart.dll</HintPath>
         </Reference>
         <Reference Include="Telerik.Windows.Controls.Data, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries.NoXaml\WPF45\Telerik.Windows.Controls.Data.dll</HintPath>
         </Reference>
         <Reference Include="Telerik.Windows.Controls.Docking, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
           <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.Docking.dll</HintPath>
           <Private>True</Private>
-...
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\Telerik\Telerik.Windows.Data.dll</HintPath>
         </Reference>
         <Reference Include="Telerik.Windows.Themes.VisualStudio2013">
           <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries.NoXaml\WPF45\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
         </Reference>
         <Reference Include="Telerik.Windows.Zip, Version=2019.3.903.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\Telerik\Telerik.Windows.Zip.dll</HintPath>
-...
           <DependentUpon>TraceDocument.xaml</DependentUpon>
         </Compile>
         <Compile Include="Controls\TraceTextSource.cs" />
         <Compile Include="Data\DataConvert.cs" />
         <Compile Include="Data\ConvertCOUNT.cs" />
         <Compile Include="Data\ConvertPDF.cs" />
         <Compile Include="Data\FinalPDF.cs" />
         <Compile Include="Data\MenuItem.cs" />
         <Compile Include="Data\SelectedCountItem.cs" />
-...
           <DesignTime>True</DesignTime>
           <DependentUpon>MarkusModel.edmx</DependentUpon>
         </Compile>
         <Compile Include="SELECT_CONVERT_COUNT.cs">
           <DependentUpon>MarkusModel.tt</DependentUpon>
         </Compile>
         <Compile Include="SELECT_CONVERT_ITEM_Result.cs">
           <DependentUpon>MarkusModel.tt</DependentUpon>
         </Compile>
         <Compile Include="SELECT_FINAL_PDF_Result.cs">
           <DependentUpon>MarkusModel.tt</DependentUpon>
         </Compile>
         <Compile Include="ViewModel\DashBoardViewModel.cs" />
         <Compile Include="ViewModel\FinalPDFViewModel.cs" />
         <Compile Include="ViewModel\FinalPDFAddDialogViewModel.cs" />
         <Compile Include="ViewModel\ConvertAddDialogViewModel.cs" />
-...
         <Compile Include="Views\ConvertAddDialog.xaml.cs">
           <DependentUpon>ConvertAddDialog.xaml</DependentUpon>
         </Compile>
         <Compile Include="Views\DashBoard.xaml.cs">
           <DependentUpon>DashBoard.xaml</DependentUpon>
         </Compile>
         <Compile Include="Views\DataBaseView.xaml.cs">
           <DependentUpon>DataBaseView.xaml</DependentUpon>
         </Compile>
-...
           <Generator>MSBuild:Compile</Generator>
           <SubType>Designer</SubType>
         </Page>
         <Page Include="Views\DashBoard.xaml">
           <SubType>Designer</SubType>
           <Generator>MSBuild:Compile</Generator>
         </Page>
         <Page Include="Views\DataBaseView.xaml">
           <Generator>MSBuild:Compile</Generator>
           <SubType>Designer</SubType>

                 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<SELECT_FINAL_PDF_Result>("markusEntities.SELECT_FINAL_PDF_ITEM", p_IDParameter, p_PROJECT_NOParameter, p_DOCUMENT_IDParameter, p_MARKUPINFO_IDParameter, p_DOCINFO_IDParameter, p_DOCUMENT_NAMEParameter, p_DOCUMENT_NOParameter, p_CREATE_USER_IDParameter, p_STATUSParameter, p_TAKE_COUNTParameter, p_GROUP_NOParameter, p_REVISIONParameter, p_BEGIN_CREATE_DATETIMEParameter, p_FINISH_CREATE_DATETIMEParameter, p_BEGIN_START_DATETIEParameter, p_FINISH_START_DATETIMEParameter, p_BEGIN_END_DATETIMEParameter, p_FINISH_END_DATETIMEParameter, p_DOCUMENT_URLParameter);
+            }
             public virtual int CONVERT_COUNT(Nullable<int> p_STATUS, Nullable<System.DateTime> p_BEGIN_CREATE_DATETIME, Nullable<System.DateTime> p_FINISH_CREATE_DATETIME)
+            {
                 var p_STATUSParameter = p_STATUS.HasValue ?
                     new ObjectParameter("P_STATUS", p_STATUS) :
                     new ObjectParameter("P_STATUS", typeof(int));
                 var p_BEGIN_CREATE_DATETIMEParameter = p_BEGIN_CREATE_DATETIME.HasValue ?
                     new ObjectParameter("P_BEGIN_CREATE_DATETIME", p_BEGIN_CREATE_DATETIME) :
                     new ObjectParameter("P_BEGIN_CREATE_DATETIME", typeof(System.DateTime));
                 var p_FINISH_CREATE_DATETIMEParameter = p_FINISH_CREATE_DATETIME.HasValue ?
                     new ObjectParameter("P_FINISH_CREATE_DATETIME", p_FINISH_CREATE_DATETIME) :
                     new ObjectParameter("P_FINISH_CREATE_DATETIME", typeof(System.DateTime));
                 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("markusEntities.CONVERT_COUNT", p_STATUSParameter, p_BEGIN_CREATE_DATETIMEParameter, p_FINISH_CREATE_DATETIMEParameter);
+            }
             public virtual ObjectResult<SELECT_CONVERT_COUNT> SELECT_CONVERT_COUNT(Nullable<int> p_STATUS, Nullable<System.DateTime> p_BEGIN_CREATE_DATETIME, Nullable<System.DateTime> p_FINISH_CREATE_DATETIME)
+            {
                 var p_STATUSParameter = p_STATUS.HasValue ?
                     new ObjectParameter("P_STATUS", p_STATUS) :
                     new ObjectParameter("P_STATUS", typeof(int));
                 var p_BEGIN_CREATE_DATETIMEParameter = p_BEGIN_CREATE_DATETIME.HasValue ?
                     new ObjectParameter("P_BEGIN_CREATE_DATETIME", p_BEGIN_CREATE_DATETIME) :
                     new ObjectParameter("P_BEGIN_CREATE_DATETIME", typeof(System.DateTime));
                 var p_FINISH_CREATE_DATETIMEParameter = p_FINISH_CREATE_DATETIME.HasValue ?
                     new ObjectParameter("P_FINISH_CREATE_DATETIME", p_FINISH_CREATE_DATETIME) :
                     new ObjectParameter("P_FINISH_CREATE_DATETIME", typeof(System.DateTime));
                 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<SELECT_CONVERT_COUNT>("markusEntities.SELECT_CONVERT_COUNT", p_STATUSParameter, p_BEGIN_CREATE_DATETIMEParameter, p_FINISH_CREATE_DATETIMEParameter);
+            }
+        }
+    }

         <!-- SSDL content -->
         <edmx:StorageModels>
         <Schema Namespace="markusModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
             <Function Name="CONVERT_COUNT" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
               <Parameter Name="P_STATUS" Type="int" Mode="In" />
               <Parameter Name="P_BEGIN_CREATE_DATETIME" Type="datetime" Mode="In" />
               <Parameter Name="P_FINISH_CREATE_DATETIME" Type="datetime" Mode="In" />
             </Function>
             <Function Name="SELECT_CONVERT_DELETE" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
               <Parameter Name="P_ID" Type="nvarchar" Mode="In" />
             </Function>
-...
                 <Parameter Name="P_FINISH_END_DATETIME" Mode="In" Type="DateTime" />
                 <Parameter Name="P_DOCUMENT_URL" Mode="In" Type="String" />
               </FunctionImport>
               <FunctionImport Name="CONVERT_COUNT">
                 <Parameter Name="P_STATUS" Mode="In" Type="Int32" />
                 <Parameter Name="P_BEGIN_CREATE_DATETIME" Mode="In" Type="DateTime" />
                 <Parameter Name="P_FINISH_CREATE_DATETIME" Mode="In" Type="DateTime" />
               </FunctionImport>
               <FunctionImport Name="SELECT_CONVERT_COUNT" ReturnType="Collection(markusModel.SELECT_CONVERT_COUNT)">
                 <Parameter Name="P_STATUS" Mode="In" Type="Int32" />
                 <Parameter Name="P_BEGIN_CREATE_DATETIME" Mode="In" Type="DateTime" />
                 <Parameter Name="P_FINISH_CREATE_DATETIME" Mode="In" Type="DateTime" />
               </FunctionImport>
             </EntityContainer>
             <ComplexType Name="SELECT_CONVERT_ITEM_Result">
               <Property Type="String" Name="ID" Nullable="false" MaxLength="50" />
-...
               <Property Type="String" Name="PROPERTIES_VALUE" Nullable="false" />
               <Property Type="String" Name="CONVERT_PATH" Nullable="false" />
             </ComplexType>
             <ComplexType Name="SELECT_CONVERT_COUNT" >
               <Property Type="String" Name="PROJECT_NO" Nullable="false" />
               <Property Type="Int32" Name="COUNT" Nullable="false" />
             </ComplexType>
           </Schema>
         </edmx:ConceptualModels>
         <!-- C-S mapping content -->
-...
                   <ComplexTypeMapping TypeName="markusModel.SELECT_FINAL_PDF_Result" />
                 </ResultMapping>
               </FunctionImportMapping>
               <FunctionImportMapping FunctionImportName="CONVERT_COUNT" FunctionName="markusModel.Store.CONVERT_COUNT" />
               <FunctionImportMapping FunctionImportName="SELECT_CONVERT_COUNT" FunctionName="markusModel.Store.CONVERT_COUNT">
                 <ResultMapping>
                   <ComplexTypeMapping TypeName="markusModel.SELECT_CONVERT_COUNT">
                     <ScalarProperty Name="PROJECT_NO" ColumnName="PROJECT_NO" />
                     <ScalarProperty Name="COUNT" ColumnName="COUNT" />
                   </ComplexTypeMapping>
                 </ResultMapping>
               </FunctionImportMapping>
             </EntityContainerMapping>
           </Mapping>
         </edmx:Mappings>

     //------------------------------------------------------------------------------
     // <auto-generated>
     //     이 코드는 템플릿에서 생성되었습니다.
     //
     //     이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
     //     이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
     // </auto-generated>
     //------------------------------------------------------------------------------
     namespace Markus.Service.StationController
+    {
         using System;
         public partial class SELECT_CONVERT_COUNT
+        {
             public string PROJECT_NO { get; set; }
             public int COUNT { get; set; }
+        }
+    }

     using Markus.Service.Extensions;
     using Markus.Service.StationController.Data;
     using Markus.Service.StationController.Extensions;
     using Newtonsoft.Json;
     using Telerik.Charting;
     using Telerik.Windows.Controls;
     using Telerik.Windows.Controls.ChartView;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     using System.Windows;
     using System.Windows.Threading;
     using ConverCOUNT = Markus.Service.StationController.Data.ConvertCOUNT;
     using System.Collections.ObjectModel;
     namespace Markus.Service.StationController.ViewModel
+    {
         class DashBoardViewModel : Mvvm.ToolKit.ViewModelBase
+        {
             #region Constructor
             public DashBoardViewModel()
+            {
                 RemoveCreateTimeFilterCommand = new DelegateCommand(RemoveCreateTimeFilter);
+            }
             #endregion
             #region Properties
             static DateTime DefaultCreateTime = DateTime.Now;
             private DateTime _SelectedCreateTimeBegin = DefaultCreateTime;
             public DateTime SelectedCreateTimeBegin
+            {
                 get { return _SelectedCreateTimeBegin; }
                 set
+                {
                     if (_SelectedCreateTimeBegin == value)
                         return;
                     _SelectedCreateTimeBegin = value;
                     OnPropertyChanged(() => SelectedCreateTimeBegin);
+                }
+            }
             private DateTime _SelectedCreateTimeEnd = DefaultCreateTime;
             public DateTime SelectedCreateTimeEnd
+            {
                 get { return _SelectedCreateTimeEnd; }
                 set
+                {
                     if (_SelectedCreateTimeEnd == value)
                         return;
                     _SelectedCreateTimeEnd = value;
                     OnPropertyChanged(() => SelectedCreateTimeEnd);
+                }
+            }
             private SelectedCountItem _SelectedCount;
             public SelectedCountItem SelectedCount
+            {
                 get => _SelectedCount;
                 set
+                {
                     _SelectedCount = value;
                     OnPropertyChanged(() => SelectedCount);
+                }
+            }
             List<SelectedCountItem> _SelectedCountList;
             public List<SelectedCountItem> SelectedCountList
+            {
                 get
+                {
                     if (_SelectedCountList == null)
+                    {
                         _SelectedCountList = new List<SelectedCountItem>
+                        {
                             new SelectedCountItem{DisplayMember = "50",ValueMember = 50},
                             new SelectedCountItem{DisplayMember = "100",ValueMember = 100},
                             new SelectedCountItem{DisplayMember = "150",ValueMember = 150},
                             new SelectedCountItem{DisplayMember = "200",ValueMember = 200}
                         };
+                    }
                     return _SelectedCountList;
+                }
+            }
             private ObservableCollection<ConvertCOUNT> _ExceptionCount;
             public ObservableCollection<ConvertCOUNT> ExceptionCount
+            {
                 get
+                {
                     if (_ExceptionCount == null)
+                    {
                         _ExceptionCount = new ObservableCollection<ConvertCOUNT>();
+                    }
                     return _ExceptionCount;
+                }
                 set
+                {
                     _ExceptionCount = value;
                     OnPropertyChanged(() => ExceptionCount);
+                }
+            }
             private ObservableCollection<ConvertCOUNT> _ConvertCount;
             public ObservableCollection<ConvertCOUNT> ConvertCount
+            {
                 get
+                {
                     if (_ConvertCount == null)
+                    {
                         _ConvertCount = new ObservableCollection<ConvertCOUNT>();
+                    }
                     return _ConvertCount;
+                }
                 set
+                {
                     _ConvertCount = value;
                     OnPropertyChanged(() => ConvertCount);
+                }
+            }
             private Telerik.Windows.Data.EnumMemberViewModel _SelectedStatus;
             public Telerik.Windows.Data.EnumMemberViewModel SelectedStatus
+            {
                 get => _SelectedStatus;
                 set
+                {
                     _SelectedStatus = value;
                     OnPropertyChanged(() => SelectedStatus);
+                }
+            }
             IEnumerable<Telerik.Windows.Data.EnumMemberViewModel> _StatusCodeList;
             public IEnumerable<Telerik.Windows.Data.EnumMemberViewModel> StatusCodeList
+            {
                 get
+                {
                     if (_StatusCodeList == null)
+                    {
                         _StatusCodeList = Telerik.Windows.Data.EnumDataSource.FromType<ConvertPDF.StatusCodeType>();
+                    }
                     return _StatusCodeList;
+                }
+            }
             #endregion
             #region Command
             public DelegateCommand RemoveCreateTimeFilterCommand { get; private set; }
             #endregion
             #region Main Logic
             /// <summary>
             /// 각각의 Grid row 객체들 업데이트
             /// </summary>
             private DispatcherTimer dispatcherTimer;
             public override void Loaded()
+            {
                 base.Loaded();
                 if (!App.IsDesignMode)
+                {
                     dispatcherTimer = new DispatcherTimer();
                     dispatcherTimer.Tick += new EventHandler(Timer_Tick);
                     dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
                     dispatcherTimer.Start();

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

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 2f07b70a