프로젝트

일반

사용자정보

개정판 ffa5dbc7

IDffa5dbc7bd7cf43382f92fca201825774e8b0923
상위 9f56088c
하위 c8dd192f

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

uniform size 버튼 수정

Change-Id: I3aaaaa42e5ed1bf36edef97ad08c556a44eb836d

차이점 보기:

ConvertService/ServiceBase/ConvertionWebService/Conversion.asmx.cs
591 591
                    }
592 592
                    document_Name = Base64DecodeFromStr(document_Name);
593 593

  
594
                    var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault();
594
                    var doc = _entity.DOCUMENT_ITEM.Where(d => d.PROJECT_NO == prj_No && d.ID == document_Id).FirstOrDefault();
595 595
                    if(doc != null)
596 596
                    {
597 597
                        doc.DOCUMENT_ID = _doc_id;
......
675 675
                string _doc_id = ((UInt32)document_Id.GetHashCode()).ToString();
676 676
                using (DeepView_Entity _entity = new DeepView_Entity(ConnectStringBuilder.DeepViewConnectionString().ToString()))
677 677
                {
678
                    var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault();
678
                    var doc = _entity.DOCUMENT_ITEM.Where(d =>d.PROJECT_NO ==  prj_No && d.ID == document_Id).FirstOrDefault();
679

  
679 680
                    if (doc != null)
680 681
                    {
681
                        var converterdoc = _entity.CONVERTER_DOC.Where(c => c.DOCUMENT_ID == doc.DOCUMENT_ID).FirstOrDefault();
682
                        var converterdoc = _entity.CONVERTER_DOC.Where(c =>c.PROJECT_NO == doc.PROJECT_NO && c.DOCUMENT_ID == doc.DOCUMENT_ID).FirstOrDefault();
682 683
                        _entity.DeleteObject(converterdoc);
683 684
                        _entity.DeleteObject(doc);
684 685
                        _entity.SaveChanges();
686

  
685 687
                        document_Url = HttpUtility.UrlDecode(document_Url);
686 688
                    }
689

  
687 690
                    int cnt = _entity.DOCUMENT_ITEM.ToList().Count;
688 691
                    if (string.IsNullOrEmpty(group_No))
689 692
                    {
FinalService/KCOM_FinalService/KCOM_FinalService/Remoting/RemFinalPDFStation.cs
237 237
            {
238 238
                using (KCOMDataModel.DataModel.KCOMEntities _entity = new KCOMEntities(KCOMDataModel.Common.ConnectStringBuilder.KCOMConnectionString().ToString()))
239 239
                {
240
                    FINAL_PDF finalpdf = _entity.FINAL_PDF.Where(final => final.ID == FinalID).FirstOrDefault();
240
                    FINAL_PDF finalpdf = _entity.FINAL_PDF.Where(final =>final.PROJECT_NO == ProjectNo && final.ID == FinalID).FirstOrDefault();
241 241
                    if (finalpdf != null)
242 242
                    {
243 243
                        ThreadPool.QueueUserWorkItem(this.MakeMergedPDF, finalpdf);
KCOM/KCOM.csproj
1353 1353
    </BootstrapperPackage>
1354 1354
  </ItemGroup>
1355 1355
  <ItemGroup>
1356
    <None Include="obfuscar.xml" />
1356
    <None Include="obfuscar.xml">
1357
      <SubType>Designer</SubType>
1358
    </None>
1357 1359
  </ItemGroup>
1358 1360
  <ItemGroup>
1359 1361
    <None Include="Connected Services\KcomService\configuration91.svcinfo" />
......
1399 1401
 call "appCast_SNI.bat" "@(VersionNumber)"
1400 1402
 call "appCast_Daelim_test.bat" "@(VersionNumber)"
1401 1403

  
1402
)
1403

  
1404 1404
call $(SolutionDir)obfuscarBuild.Bat $(SolutionDir) $(TargetDir) $(ProjectDir)obfuscar.xml
1405 1405

  
1406
xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F</PostBuildEvent>
1406
xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F
1407
)
1408
</PostBuildEvent>
1407 1409
  </PropertyGroup>
1408 1410
  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
1409 1411
  <Target Name="app_config_AfterCompile" AfterTargets="AfterCompile" Condition="Exists('app.$(Configuration).config')">
KCOM/Views/MainMenu.xaml.cs
5094 5094
            string uri = this.GetImageURL(CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.SyncPageNumber);
5095 5095
            var isOriginalSize = !(ViewerDataModel.Instance.SyncPageNumber == pageNavigator.CurrentPage.PageNumber);
5096 5096

  
5097
            ComparePageLoad(uri, isOriginalSize);
5097
            ComparePageLoad(uri, OriginalSizeMode.IsChecked);
5098 5098
        }
5099 5099

  
5100 5100
        private void EnsembleLink_Button_Click(object sender, RoutedEventArgs e)
KCOM_API/KCOM_API.csproj
576 576
    <Error Condition="!Exists('..\packages\Obfuscar.2.2.29\build\obfuscar.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Obfuscar.2.2.29\build\obfuscar.props'))" />
577 577
  </Target>
578 578
  <PropertyGroup>
579
    <PostBuildEvent>call $(SolutionDir)obfuscarBuild.Bat $(SolutionDir) $(TargetDir) $(ProjectDir)obfuscar.xml
580

  
581
xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F</PostBuildEvent>
579
    <PostBuildEvent>rem call $(SolutionDir)obfuscarBuild.Bat $(SolutionDir) $(TargetDir) $(ProjectDir)obfuscar.xml
580
rem xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F</PostBuildEvent>
582 581
  </PropertyGroup>
583 582
</Project>
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml
7 7
  <PropertyGroup>
8 8
    <WebPublishMethod>FileSystem</WebPublishMethod>
9 9
    <PublishProvider>FileSystem</PublishProvider>
10
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
11
    <LastUsedPlatform>x64</LastUsedPlatform>
10
    <LastUsedBuildConfiguration>Release_Default</LastUsedBuildConfiguration>
11
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
12 12
    <SiteUrlToLaunchAfterPublish />
13 13
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
14 14
    <ExcludeApp_Data>False</ExcludeApp_Data>
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user
10 10
  </PropertyGroup>
11 11
  <ItemGroup>
12 12
    <File Include="bin/CommonLib.dll">
13
      <publishTime>01/19/2021 13:34:59</publishTime>
13
      <publishTime>01/19/2021 16:46:06</publishTime>
14 14
    </File>
15 15
    <File Include="bin/CommonLib.pdb">
16
      <publishTime>10/15/2020 09:18:32</publishTime>
16
      <publishTime>01/19/2021 16:46:06</publishTime>
17 17
    </File>
18 18
    <File Include="bin/CompareLib.dll">
19 19
      <publishTime>03/27/2018 10:07:16</publishTime>
......
58 58
      <publishTime>09/19/2015 15:28:04</publishTime>
59 59
    </File>
60 60
    <File Include="bin/IFinalPDF.dll">
61
      <publishTime>01/19/2021 13:34:59</publishTime>
61
      <publishTime>01/19/2021 16:46:06</publishTime>
62 62
    </File>
63 63
    <File Include="bin/IFinalPDF.pdb">
64
      <publishTime>09/22/2020 10:10:32</publishTime>
64
      <publishTime>01/19/2021 16:46:06</publishTime>
65 65
    </File>
66 66
    <File Include="bin/IKCOM.dll">
67
      <publishTime>01/19/2021 13:35:04</publishTime>
67
      <publishTime>01/19/2021 16:46:10</publishTime>
68 68
    </File>
69 69
    <File Include="bin/IKCOM.pdb">
70
      <publishTime>10/15/2020 09:18:39</publishTime>
70
      <publishTime>01/19/2021 16:46:10</publishTime>
71 71
    </File>
72 72
    <File Include="bin/it/ZedGraph.resources.dll">
73 73
      <publishTime>09/19/2015 15:28:04</publishTime>
......
76 76
      <publishTime>09/19/2015 15:28:04</publishTime>
77 77
    </File>
78 78
    <File Include="bin/KCOMDataModel.dll">
79
      <publishTime>01/19/2021 13:35:00</publishTime>
79
      <publishTime>01/19/2021 16:46:07</publishTime>
80 80
    </File>
81 81
    <File Include="bin/KCOMDataModel.dll.config">
82 82
      <publishTime>06/08/2020 15:07:57</publishTime>
83 83
    </File>
84 84
    <File Include="bin/KCOMDataModel.pdb">
85
      <publishTime>10/15/2020 09:18:33</publishTime>
85
      <publishTime>01/19/2021 16:46:07</publishTime>
86 86
    </File>
87 87
    <File Include="bin/KCOM_API.dll">
88
      <publishTime>01/19/2021 13:35:08</publishTime>
88
      <publishTime>01/19/2021 16:50:25</publishTime>
89 89
    </File>
90 90
    <File Include="bin/KCOM_API.pdb">
91
      <publishTime>10/15/2020 10:35:28</publishTime>
91
      <publishTime>01/19/2021 16:50:25</publishTime>
92 92
    </File>
93 93
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
94 94
      <publishTime>06/29/2017 11:38:22</publishTime>
......
220 220
      <publishTime>07/10/2019 14:11:36</publishTime>
221 221
    </File>
222 222
    <File Include="Web.config">
223
      <publishTime>01/19/2021 13:37:20</publishTime>
223
      <publishTime>01/19/2021 16:50:25</publishTime>
224 224
    </File>
225 225
  </ItemGroup>
226 226
</Project>
KCOM_API/obfuscar.xml
3 3
  <Var name="InPath" value=".\" />
4 4
  <Var name="OutPath" value=".\Obfuscator_Output"/>
5 5
  <Var name="KeepPublicApi" value="true" />
6
  <Module file="$(InPath)\KCOM_API.dll"/>
7
  <Module file="$(InPath)\Markus.Image.OpenCV.dll" />
8
  <Module file="$(InPath)\KCOMDataModel.dll" />
6
  <Module file="$(InPath)\KCOM_API.dll">
7
    <SkipNamespace name="KCOM_API.Properties*" />
8
  </Module>
9 9
</Obfuscator>

내보내기 Unified diff

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