Skip to content

Commit

Permalink
Multiple improvements
Browse files Browse the repository at this point in the history
Updated layout otpions description
Layout is now defined with an Enum
Metadata are always retrieved for relationship to figure out which entity is the primary one
  • Loading branch information
MscrmTools committed Nov 21, 2019
1 parent 7a1dfef commit 852afdb
Show file tree
Hide file tree
Showing 13 changed files with 1,022 additions and 753 deletions.
2 changes: 1 addition & 1 deletion NNCheckboxes/NNCheckboxes.pcfproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.PowerApps.MSBuild.Pcf" Version="0.*"/>
<PackageReference Include="Microsoft.PowerApps.MSBuild.Pcf" Version="1.*"/>
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 23 additions & 11 deletions NNCheckboxes/NNCheckboxes/ControlManifest.Input.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,45 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<manifest>
<control namespace="MscrmTools" constructor="NNCheckboxes" version="1.0.11" display-name-key="NNCheckboxes_Display_Key" description-key="NNCheckboxes_Desc_Key" control-type="standard" preview-image="logo.png">
<control namespace="MscrmTools" constructor="NNCheckboxes" version="1.0.13" display-name-key="NNCheckboxes_Display_Key" description-key="NNCheckboxes_Desc_Key" control-type="standard" preview-image="imgs/logo.png">
<data-set name="nnRelationshipDataSet" display-name-key="nnRelationshipDataSet_Display_Key">
<property-set name="displayAttribute" display-name-key="targetEntity_Display_Key" description-key="targetEntity_Desc_Key" of-type="SingleLine.Text" usage="bound" required="true" />
<property-set name="backgroundColorAttribute" display-name-key="backgroundColorAttribute_Display_Key" description-key="backgroundColorAttribute_Desc_Key" of-type-group="colorTypes" usage="bound" required="false" />
<property-set name="foreColorAttribute" display-name-key="foreColorAttribute_Display_Key" description-key="foreColorAttribute_Desc_Key" of-type-group="colorTypes" usage="bound" required="false" />
<property-set name="categoryAttribute" display-name-key="categoryAttribute_Display_Key" description-key="categoryAttribute_Desc_Key" of-type-group="categoryTypes" usage="bound" required="false" />
</data-set>
<property name="parentEntityLogicalName" display-name-key="parentEntityLogicalName_Display_Key" description-key="parentEntityLogicalName_Desc_Key" of-type="SingleLine.Text" usage="input" required="true" />
<property name="relationshipSchemaName" display-name-key="relationshipSchemaName_Display_Key" description-key="relationshipSchemaName_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" />
<property name="columnsNumber" display-name-key="columnsNumber_Display_Key" description-key="columnsNumber_Desc_Key" of-type="Whole.None" usage="input" required="true" default-value="2" />
<property name="useToggleSwitch" display-name-key="useToggleSwitch_Display_Key" description-key="useToggleSwitch_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" default-value="false" />
<property name="toggleDefaultBackgroundColorOff" display-name-key="toggleDefaultBackgroundColorOff_Display_Key" description-key="toggleDefaultBackgroundColorOff_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" default-value="#CC0000" />
<property name="toggleDefaultBackgroundColorOn" display-name-key="toggleDefaultBackgroundColorOn_Display_Key" description-key="toggleDefaultBackgroundColorOn_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" default-value="#008800" />
<property name="relationshipSchemaName" display-name-key="relationshipSchemaName_Display_Key" description-key="relationshipSchemaName_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" />
<property name="columnsNumber" display-name-key="columnsNumber_Display_Key" description-key="columnsNumber_Desc_Key" of-type="Whole.None" usage="input" required="true" default-value="2" />
<property name="useToggleSwitch" display-name-key="useToggleSwitch_Display_Key" description-key="useToggleSwitch_Desc_Key" of-type="Enum" usage="input" required="true">
<value name="True" display-name-key="useToggleSwitchTrue" description-key="useToggleSwitchTrue_Desc">True</value>
<value name="False" display-name-key="useToggleSwitchFalse" description-key="useToggleSwitchFalse_Desc" default="true">False</value>
</property>
<property name="toggleDefaultBackgroundColorOff" display-name-key="toggleDefaultBackgroundColorOff_Display_Key" description-key="toggleDefaultBackgroundColorOff_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" default-value="#CC0000" />
<property name="toggleDefaultBackgroundColorOn" display-name-key="toggleDefaultBackgroundColorOn_Display_Key" description-key="toggleDefaultBackgroundColorOn_Desc_Key" of-type="SingleLine.Text" usage="input" required="false" default-value="#008800" />
<type-group name="categoryTypes">
<type>SingleLine.Text</type>
<type>OptionSet</type>
<type>TwoOptions</type>
</type-group>
<type-group name="colorTypes">
<type-group name="colorTypes">
<type>SingleLine.Text</type>
<type>OptionSet</type>
</type-group>
<resources>
<code path="index.ts" order="1"/>
<code path="index.ts" order="1" />
<css path="css/NNCheckboxes.css" order="1" />
<resx path="strings/NNCheckboxes.1033.resx" version="1.0.0" />
<resx path="strings/NNCheckboxes.1036.resx" version="1.0.0" />
<img path="imgs/logo.png"/>
<!-- <img path="imgs/logo.png" /> -->
</resources>
<feature-usage>
<uses-feature name="Device.captureAudio" required="false" />
<uses-feature name="Device.captureImage" required="false" />
<uses-feature name="Device.captureVideo" required="false" />
<uses-feature name="Device.getBarcodeValue" required="false" />
<uses-feature name="Device.getCurrentPosition" required="false" />
<uses-feature name="Device.pickFile" required="false" />
<uses-feature name="Utility" required="true" />
<uses-feature name="WebAPI" required="true" />
</feature-usage>
</control>
</manifest>
2 changes: 2 additions & 0 deletions NNCheckboxes/NNCheckboxes/Solution/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin
/obj
18 changes: 18 additions & 0 deletions NNCheckboxes/NNCheckboxes/Solution/Other/Customizations.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Entities />
<Roles />
<Workflows />
<FieldSecurityProfiles />
<Templates />
<EntityMaps />
<EntityRelationships />
<OrganizationSettings />
<optionsets />
<CustomControls />
<SolutionPluginAssemblies />
<EntityDataProviders />
<Languages>
<Language>1033</Language>
</Languages>
</ImportExportXml>
2 changes: 2 additions & 0 deletions NNCheckboxes/NNCheckboxes/Solution/Other/Relationships.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<EntityRelationships xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
142 changes: 142 additions & 0 deletions NNCheckboxes/NNCheckboxes/Solution/Other/Solution.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml version="9.1.0.643" SolutionPackageVersion="9.1" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SolutionManifest>
<!-- Unique Name of Cds Solution-->
<UniqueName>Solution</UniqueName>
<LocalizedNames>
<!-- Localized Solution Name in language code -->
<LocalizedName description="Solution" languagecode="1033" />
</LocalizedNames>
<Descriptions />
<Version>1.0.2</Version>
<!-- Solution Package Type: Unmanaged(0)/Managed(1)/Both(2)-->
<Managed>2</Managed>
<Publisher>
<!-- Unique Publisher Name of Cds Solution -->
<UniqueName>MscrmTools</UniqueName>
<LocalizedNames>
<!-- Localized Cds Publisher Name in language code-->
<LocalizedName description="MscrmTools" languagecode="1033" />
</LocalizedNames>
<Descriptions>
<!-- Description of Cds Publisher in language code -->
<Description description="MscrmTools" languagecode="1033" />
</Descriptions>
<EMailAddress xsi:nil="true">
</EMailAddress>
<SupportingWebsiteUrl xsi:nil="true">
</SupportingWebsiteUrl>
<!-- Customization Prefix for the Cds Publisher-->
<CustomizationPrefix>mctools</CustomizationPrefix>
<!-- Derived Option Value Prefix for the Customization Prefix of Cds Publisher -->
<CustomizationOptionValuePrefix>54953</CustomizationOptionValuePrefix>
<Addresses>
<!-- Address of the Publisher-->
<Address>
<AddressNumber>1</AddressNumber>
<AddressTypeCode>1</AddressTypeCode>
<City xsi:nil="true">
</City>
<County xsi:nil="true">
</County>
<Country xsi:nil="true">
</Country>
<Fax xsi:nil="true">
</Fax>
<FreightTermsCode xsi:nil="true">
</FreightTermsCode>
<ImportSequenceNumber xsi:nil="true">
</ImportSequenceNumber>
<Latitude xsi:nil="true">
</Latitude>
<Line1 xsi:nil="true">
</Line1>
<Line2 xsi:nil="true">
</Line2>
<Line3 xsi:nil="true">
</Line3>
<Longitude xsi:nil="true">
</Longitude>
<Name xsi:nil="true">
</Name>
<PostalCode xsi:nil="true">
</PostalCode>
<PostOfficeBox xsi:nil="true">
</PostOfficeBox>
<PrimaryContactName xsi:nil="true">
</PrimaryContactName>
<ShippingMethodCode>1</ShippingMethodCode>
<StateOrProvince xsi:nil="true">
</StateOrProvince>
<Telephone1 xsi:nil="true">
</Telephone1>
<Telephone2 xsi:nil="true">
</Telephone2>
<Telephone3 xsi:nil="true">
</Telephone3>
<TimeZoneRuleVersionNumber xsi:nil="true">
</TimeZoneRuleVersionNumber>
<UPSZone xsi:nil="true">
</UPSZone>
<UTCOffset xsi:nil="true">
</UTCOffset>
<UTCConversionTimeZoneCode xsi:nil="true">
</UTCConversionTimeZoneCode>
</Address>
<Address>
<AddressNumber>2</AddressNumber>
<AddressTypeCode>1</AddressTypeCode>
<City xsi:nil="true">
</City>
<County xsi:nil="true">
</County>
<Country xsi:nil="true">
</Country>
<Fax xsi:nil="true">
</Fax>
<FreightTermsCode xsi:nil="true">
</FreightTermsCode>
<ImportSequenceNumber xsi:nil="true">
</ImportSequenceNumber>
<Latitude xsi:nil="true">
</Latitude>
<Line1 xsi:nil="true">
</Line1>
<Line2 xsi:nil="true">
</Line2>
<Line3 xsi:nil="true">
</Line3>
<Longitude xsi:nil="true">
</Longitude>
<Name xsi:nil="true">
</Name>
<PostalCode xsi:nil="true">
</PostalCode>
<PostOfficeBox xsi:nil="true">
</PostOfficeBox>
<PrimaryContactName xsi:nil="true">
</PrimaryContactName>
<ShippingMethodCode>1</ShippingMethodCode>
<StateOrProvince xsi:nil="true">
</StateOrProvince>
<Telephone1 xsi:nil="true">
</Telephone1>
<Telephone2 xsi:nil="true">
</Telephone2>
<Telephone3 xsi:nil="true">
</Telephone3>
<TimeZoneRuleVersionNumber xsi:nil="true">
</TimeZoneRuleVersionNumber>
<UPSZone xsi:nil="true">
</UPSZone>
<UTCOffset xsi:nil="true">
</UTCOffset>
<UTCConversionTimeZoneCode xsi:nil="true">
</UTCConversionTimeZoneCode>
</Address>
</Addresses>
</Publisher>
<RootComponents />
<MissingDependencies />
</SolutionManifest>
</ImportExportXml>
48 changes: 48 additions & 0 deletions NNCheckboxes/NNCheckboxes/Solution/Solution.cdsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>
</PropertyGroup>

<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<Import Project="$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.props" Condition="Exists('$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.props')" />

<PropertyGroup>
<ProjectGuid>4315b98f-4b2a-46f9-86fd-82f871bae6f6</ProjectGuid>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<!--Remove TargetFramework when this is available in 16.1-->
<TargetFramework>net462</TargetFramework>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>

<!-- Solution Packager overrides, un-comment to use: SolutionPackagerType (Managed, Unmanaged, Both)
<PropertyGroup>
<SolutionPackageType>Managed</SolutionPackageType>
</PropertyGroup>
-->

<ItemGroup>
<PackageReference Include="Microsoft.PowerApps.MSBuild.Solution" Version="1.*" />
</ItemGroup>

<ItemGroup>
<ExcludeDirectories Include="$(MSBuildThisFileDirectory)\.gitignore" />
<ExcludeDirectories Include="$(MSBuildThisFileDirectory)\bin\**" />
<ExcludeDirectories Include="$(MSBuildThisFileDirectory)\obj\**" />
<ExcludeDirectories Include="$(MSBuildThisFileDirectory)\*.cdsproj" />
<ExcludeDirectories Include="$(MSBuildThisFileDirectory)\*.cdsproj.user" />
<ExcludeDirectories Include="$(MSBuildThisFileDirectory)\*.sln" />
</ItemGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\**" Exclude="@(ExcludeDirectories)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\NNCheckboxes.pcfproj" />
</ItemGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
<Import Project="$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.targets" Condition="Exists('$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.targets')" />

</Project>
Loading

0 comments on commit 852afdb

Please sign in to comment.