Skip to content

Commit

Permalink
Merge pull request #1 from allenlooplee/feature-20200324
Browse files Browse the repository at this point in the history
Feature 20200324
  • Loading branch information
allenlooplee authored Mar 28, 2020
2 parents d3391e3 + b34c3e2 commit 4691eaf
Show file tree
Hide file tree
Showing 61 changed files with 4,996 additions and 181 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,8 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# Testing Framework for UiPath
/tests/CcintOcrBasicTests/.local
/tests/CcintOcrBasicTests/.screenshots
/tests/CcintOcrBasicTests/Tests_Examples_Templates/UnitTest_Examples
Original file line number Diff line number Diff line change
@@ -1,64 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>54dcd9ad-f9fc-48d8-941a-c6b77c572798</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Ccint.Ocr.Activities.Design</RootNamespace>
<AssemblyName>Ccint.Ocr.Activities.Design</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Output\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Output\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System"/>

<Reference Include="System.Core"/>
<Reference Include="System.Xml.Linq"/>
<Reference Include="System.Data.DataSetExtensions"/>


<Reference Include="Microsoft.CSharp"/>

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{54DCD9AD-F9FC-48D8-941A-C6B77C572798}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Ccint.Ocr.Activities.Design</RootNamespace>
<AssemblyName>Ccint.Ocr.Activities.Design</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Output\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Output\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Data"/>
<Reference Include="System.Xml"/>
<Reference Include="System.Activities"/>
<Reference Include="System.Activities.Presentation"/>
<Reference Include="System.Xaml"/>
<Reference Include="WindowsBase"/>
<Reference Include="System.Activities.Core.Presentation"/>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Activities" />
<Reference Include="System.Activities.Presentation" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="System.Activities.Core.Presentation" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Compile Include="..\..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Ccint.OcrAssemblyInfo.cs">
<Link>Properties\Ccint.OcrAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs"/>
<Compile Include="Properties\SharedResources.cs"/>
<Compile Include="Designers\BankCardActivityDesigner.xaml.cs">
<DependentUpon>BankCardActivityDesigner.xaml</DependentUpon>
</Compile>
<Compile Include="Designers\BusinessLicenseActivityDesigner.xaml.cs">
<DependentUpon>BusinessLicenseActivityDesigner.xaml</DependentUpon>
</Compile>
<Compile Include="Designers\CcintOcrScopeDesigner.xaml.cs">
<DependentUpon>CcintOcrScopeDesigner.xaml</DependentUpon>
</Compile>
<Compile Include="Designers\IdCardActivityDesigner.xaml.cs">
<DependentUpon>IdCardActivityDesigner.xaml</DependentUpon>
</Compile>
<Compile Include="Designers\VatInvoiceActivityDesigner.xaml.cs">
<DependentUpon>VatInvoiceActivityDesigner.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\SharedResources.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Expand All @@ -84,6 +95,26 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Designers\BankCardActivityDesigner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Designers\BusinessLicenseActivityDesigner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Designers\CcintOcrScopeDesigner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Designers\IdCardActivityDesigner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Designers\VatInvoiceActivityDesigner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Icons.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand All @@ -94,9 +125,7 @@
<Name>Ccint.Ocr.Activities</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Designers\" />
</ItemGroup>
<ItemGroup />
<Import Project="..\..\Shared\UiPath.Shared.Activities.Design\UiPath.Shared.Activities.Design.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand All @@ -112,4 +141,4 @@
"$(SolutionDir).nuget\NuGet.exe" pack "$(ProjectPath)" -OutputDirectory "Packages" -IncludeReferencedProjects -Prop Configuration=$(ConfigurationName)
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<description>$description$</description>
<copyright>$copyright$</copyright>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://integrations.uipath.com/docs/integrating-with-uipath</projectUrl>
<licenseUrl>https://github.com/allenlooplee/CcintOcrActivitiesPack/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/allenlooplee/CcintOcrActivitiesPack</projectUrl>
<iconUrl>https://raw.githubusercontent.com/NuGet/Samples/master/PackageIconNuspecExample/icon.png</iconUrl>
<tags>UiPath Activit𝗒</tags>
<dependencies>
Expand Down
22 changes: 21 additions & 1 deletion Ccint.Ocr/Ccint.Ocr.Activities.Design/DesignerMetadata.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Activities.Presentation.Metadata;
using System.Activities.Presentation.Metadata;
using System.ComponentModel;
using System.ComponentModel.Design;
using Ccint.Ocr.Activities.Design.Designers;
Expand All @@ -20,6 +20,26 @@ public void Register()
#endregion Setup


builder.AddCustomAttributes(typeof(CcintOcrScope), categoryAttribute);
builder.AddCustomAttributes(typeof(CcintOcrScope), new DesignerAttribute(typeof(CcintOcrScopeDesigner)));
builder.AddCustomAttributes(typeof(CcintOcrScope), new HelpKeywordAttribute(""));

builder.AddCustomAttributes(typeof(VatInvoiceActivity), categoryAttribute);
builder.AddCustomAttributes(typeof(VatInvoiceActivity), new DesignerAttribute(typeof(VatInvoiceActivityDesigner)));
builder.AddCustomAttributes(typeof(VatInvoiceActivity), new HelpKeywordAttribute(""));

builder.AddCustomAttributes(typeof(BankCardActivity), categoryAttribute);
builder.AddCustomAttributes(typeof(BankCardActivity), new DesignerAttribute(typeof(BankCardActivityDesigner)));
builder.AddCustomAttributes(typeof(BankCardActivity), new HelpKeywordAttribute(""));

builder.AddCustomAttributes(typeof(BusinessLicenseActivity), categoryAttribute);
builder.AddCustomAttributes(typeof(BusinessLicenseActivity), new DesignerAttribute(typeof(BusinessLicenseActivityDesigner)));
builder.AddCustomAttributes(typeof(BusinessLicenseActivity), new HelpKeywordAttribute(""));

builder.AddCustomAttributes(typeof(IdCardActivity), categoryAttribute);
builder.AddCustomAttributes(typeof(IdCardActivity), new DesignerAttribute(typeof(IdCardActivityDesigner)));
builder.AddCustomAttributes(typeof(IdCardActivity), new HelpKeywordAttribute(""));


MetadataStore.AddAttributeTable(builder.CreateTable());
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<sap:ActivityDesigner x:Class="Ccint.Ocr.Activities.Design.Designers.BankCardActivityDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:activity="clr-namespace:Ccint.Ocr.Activities.Properties;assembly=Ccint.Ocr.Activities"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters"
xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls">

<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\Themes\Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<converters:ActivityIconConverter x:Key="ActivityIconConverter" />
</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<sap:ActivityDesigner.Icon>
<DrawingBrush Stretch="Uniform" Drawing="{Binding Path=ModelItem, Converter={StaticResource ActivityIconConverter}, ConverterParameter=pack://application:\,\,\,/Ccint.Ocr.Activities.Design;component/themes/icons.xaml}" />
</sap:ActivityDesigner.Icon>

</sap:ActivityDesigner>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Ccint.Ocr.Activities.Design.Designers
{
/// <summary>
/// Interaction logic for BankCardActivityDesigner.xaml
/// </summary>
public partial class BankCardActivityDesigner
{
public BankCardActivityDesigner()
{
InitializeComponent();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<sap:ActivityDesigner x:Class="Ccint.Ocr.Activities.Design.Designers.BusinessLicenseActivityDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:activity="clr-namespace:Ccint.Ocr.Activities.Properties;assembly=Ccint.Ocr.Activities"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters"
xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls">

<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\Themes\Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<converters:ActivityIconConverter x:Key="ActivityIconConverter" />
</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<sap:ActivityDesigner.Icon>
<DrawingBrush Stretch="Uniform" Drawing="{Binding Path=ModelItem, Converter={StaticResource ActivityIconConverter}, ConverterParameter=pack://application:\,\,\,/Ccint.Ocr.Activities.Design;component/themes/icons.xaml}" />
</sap:ActivityDesigner.Icon>

</sap:ActivityDesigner>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Ccint.Ocr.Activities.Design.Designers
{
/// <summary>
/// Interaction logic for BusinessLicenseActivityDesigner.xaml
/// </summary>
public partial class BusinessLicenseActivityDesigner
{
public BusinessLicenseActivityDesigner()
{
InitializeComponent();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<sap:ActivityDesigner x:Class="Ccint.Ocr.Activities.Design.Designers.CcintOcrScopeDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sa="http://schemas.microsoft.com/netfx/2009/xaml/activities"
xmlns:p="clr-namespace:Ccint.Ocr.Activities.Design.Properties"
xmlns:sharedres="clr-namespace:UiPath.Shared.Localization"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters"
xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls" >


<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\Themes\Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
<converters:ActivityIconConverter x:Key="ActivityIconConverter" />
</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<sap:ActivityDesigner.Icon>
<DrawingBrush Stretch="Uniform" Drawing="{Binding Path=ModelItem, Converter={StaticResource ActivityIconConverter}, ConverterParameter=pack://application:\,\,\,/Ccint.Ocr.Activities.Design;component/themes/icons.xaml}" />
</sap:ActivityDesigner.Icon>

<uip:ActivityDecoratorControl Style="{StaticResource ActivityDecoratorStyle}">
<DockPanel LastChildFill="True">
<sap:WorkflowItemPresenter x:Uid="sad:WorkflowItemPresenter_1"
AutomationProperties.AutomationId="Activity"
DockPanel.Dock="Bottom"
MinWidth="400"
Margin="0,10,0,0"
Item="{Binding Path=ModelItem.Body.Handler, Mode=TwoWay}"
AllowedItemType="{x:Type sa:Activity}"
HintText="{x:Static p:Resources.DropActivityHere}" />

</DockPanel>
</uip:ActivityDecoratorControl>
</sap:ActivityDesigner>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Ccint.Ocr.Activities.Design.Designers
{
/// <summary>
/// Interaction logic for CcintOcrScopeDesigner.xaml
/// </summary>
public partial class CcintOcrScopeDesigner
{
public CcintOcrScopeDesigner()
{
InitializeComponent();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<sap:ActivityDesigner x:Class="Ccint.Ocr.Activities.Design.Designers.IdCardActivityDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:activity="clr-namespace:Ccint.Ocr.Activities.Properties;assembly=Ccint.Ocr.Activities"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters"
xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls">

<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\Themes\Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<converters:ActivityIconConverter x:Key="ActivityIconConverter" />
</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<sap:ActivityDesigner.Icon>
<DrawingBrush Stretch="Uniform" Drawing="{Binding Path=ModelItem, Converter={StaticResource ActivityIconConverter}, ConverterParameter=pack://application:\,\,\,/Ccint.Ocr.Activities.Design;component/themes/icons.xaml}" />
</sap:ActivityDesigner.Icon>

</sap:ActivityDesigner>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Ccint.Ocr.Activities.Design.Designers
{
/// <summary>
/// Interaction logic for IdCardActivityDesigner.xaml
/// </summary>
public partial class IdCardActivityDesigner
{
public IdCardActivityDesigner()
{
InitializeComponent();
}
}
}
Loading

0 comments on commit 4691eaf

Please sign in to comment.