Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/dp 1014 be backend work for signing MOU #1112

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ public static IEnumerable<object[]> Get_OnPost_AddsModelError_TestData()
yield return new object[] { ErrorCodes.UNKNOWN_ORGANISATION, ErrorMessagesList.UnknownOrganisation, StatusCodes.Status404NotFound };
yield return new object[] { ErrorCodes.BUYER_INFO_NOT_EXISTS, ErrorMessagesList.BuyerInfoNotExists, StatusCodes.Status404NotFound };
yield return new object[] { ErrorCodes.UNKNOWN_BUYER_INFORMATION_UPDATE_TYPE, ErrorMessagesList.UnknownBuyerInformationUpdateType, StatusCodes.Status400BadRequest };
yield return new object[] { ErrorCodes.MOU_DOES_NOT_EXIST, ErrorMessagesList.MouNotFound, StatusCodes.Status404NotFound };
}

[Theory]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private static string GetErrorMessageByCode(string errorCode)
ErrorCodes.ARGUMENT_NULL => ErrorMessagesList.PayLoadIssueOrNullAurgument,
ErrorCodes.INVALID_OPERATION => ErrorMessagesList.OrganisationCreationFailed,
ErrorCodes.PERSON_DOES_NOT_EXIST => ErrorMessagesList.PersonNotFound,
ErrorCodes.MOU_DOES_NOT_EXIST=> ErrorMessagesList.MouNotFound,
ErrorCodes.UNPROCESSABLE_ENTITY => ErrorMessagesList.UnprocessableEntity,
ErrorCodes.UNKNOWN_ORGANISATION => ErrorMessagesList.UnknownOrganisation,
ErrorCodes.BUYER_INFO_NOT_EXISTS => ErrorMessagesList.BuyerInfoNotExists,
Expand Down
2 changes: 2 additions & 0 deletions Frontend/CO.CDP.OrganisationApp/Constants/ErrorCodes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ public static class ErrorCodes

public const string PERSON_DOES_NOT_EXIST = "PERSON_DOES_NOT_EXIST";

public const string MOU_DOES_NOT_EXIST = "MOU_DOES_NOT_EXIST";

public const string UNPROCESSABLE_ENTITY = "UNPROCESSABLE_ENTITY";

public const string GENERIC_ERROR = "GENERIC_ERROR";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public static class ErrorMessagesList
public static readonly string DuplicatePersonEmail = StaticTextResource.ErrorMessageList_DuplicatePersonEmail;
public static readonly string DuplicateInviteEmail = StaticTextResource.ErrorMessageList_DuplicateInviteEmail;
public static readonly string PersonNotFound = StaticTextResource.ErrorMessageList_PersonNotFound;
public static readonly string MouNotFound = StaticTextResource.ErrorMessageList_MouNotFound;

public static readonly string PersonCreationFailed = StaticTextResource.ErrorMessageList_PersonCreationFailed;

public static readonly string OrganisationCreationFailed = StaticTextResource.ErrorMessageList_OrganisationCreationFailed;
Expand Down
110 changes: 44 additions & 66 deletions Services/CO.CDP.Localization/StaticTextResource.resx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

<!--
Microsoft ResX Schema
Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
Expand All @@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
Expand Down Expand Up @@ -273,17 +273,17 @@
<data name="Global_Admin" xml:space="preserve">
<value>Admin</value>
</data>
<data name="Global_Editor" xml:space="preserve">
<value>Editor</value>
<data name="Global_Editor" xml:space="preserve">
<value>Editor</value>
</data>
<data name="Global_Viewer" xml:space="preserve">
<value>Viewer</value>
<data name="Global_Viewer" xml:space="preserve">
<value>Viewer</value>
</data>
<data name="Global_Approve" xml:space="preserve">
<value>Approve</value>
</data>
<data name="Global_Reject" xml:space="preserve">
<value>Reject</value>
<value>Reject</value>
</data>
<data name="Organisation_MyAccount" xml:space="preserve">
<value>My account</value>
Expand Down Expand Up @@ -876,9 +876,6 @@
<data name="Supplier_ConnectedEntity_ConnectedEntityLegalFormQuestion_Heading" xml:space="preserve">
<value>Does {0} have a legal form?</value>
</data>
<data name="Supplier_ConnectedEntity_ConnectedEntityLegalFormQuestion_Hint" xml:space="preserve">
<value>Does {0} have a legal form?</value>
</data>
<data name="Supplier_ConnectedEntity_ConnectedEntityLegalFormQuestion_Hint" xml:space="preserve">
<value>In the UK, this is a business structure or trading status. For example, limited company or limited liability partnership.</value>
</data>
Expand Down Expand Up @@ -969,9 +966,6 @@
<data name="Supplier_ConnectedEntity_ConnectedEntityPscDetails_NationalityRequiredError" xml:space="preserve">
<value>Enter nationality</value>
</data>
<data name="Supplier_ConnectedEntity_ConnectedEntityPscDetails_DateOfBirthYearInvalidError" xml:space="preserve">
<value>Year must be a valid number</value>
</data>
<data name="Supplier_ConnectedEntity_ConnectedEntityRegistrationDateQuestion_DayRequiredError" xml:space="preserve">
<value>Date of registration must include a day</value>
</data>
Expand Down Expand Up @@ -1670,7 +1664,7 @@
<data name="OrganisationRegistration_OrganisationAlreadyRegistered_Heading" xml:space="preserve">
<value>This organisation has already registered</value>
</data>
<data name="OrganisationRegistration_UserConfirm" xml:space="preserve">
<data name="OrganisationRegistration_UserConfirm" xml:space="preserve">
<value>I understand my name and email address will be shared with this organisation</value>
</data>
<data name="OrganisationRegistration_OrganisationAlreadyRegistered_Message" xml:space="preserve">
Expand Down Expand Up @@ -2486,9 +2480,6 @@
<data name="Global_SaveAndExit" xml:space="preserve">
<value>Save and exit</value>
</data>
<data name="Global_Failure_Heading" xml:space="preserve">
<value>Failure</value>
</data>
<data name="Supplier_LegalFormCompanyActQuestion_Title" xml:space="preserve">
<value>Is your organisation registered on Companies House?</value>
</data>
Expand Down Expand Up @@ -2829,7 +2820,7 @@
<value>Select if you have read and agree to the Central Digital Platform service privacy policy</value>
</data>
<data name="ProvideFeedbackAndContact_WhatsItToDoWith" xml:space="preserve">
<value>What's it to do with</value>
<value>What's it to do with?</value>
</data>
<data name="ProvideFeedbackAndContact_ChooseAnOption" xml:space="preserve">
<value>Choose an option</value>
Expand Down Expand Up @@ -2879,9 +2870,6 @@
<data name="ProvideFeedbackAndContact_YouCanAskAQuestion" xml:space="preserve">
<value>You can ask a question, report a problem or suggest an improvement to the Find a Tender team.</value>
</data>
<data name="ProvideFeedbackAndContact_WhatsItToDoWith" xml:space="preserve">
<value>What's it to do with?</value>
</data>
<data name="ProvideFeedbackAndContact_TheWholeService" xml:space="preserve">
<value>The whole service</value>
</data>
Expand Down Expand Up @@ -2960,20 +2948,20 @@
<data name="UserSummary_ManageUsers_Title" xml:space="preserve">
<value>Manage users</value>
</data>
<data name="UserSummary_JoinRequests" xml:space="preserve">
<value>Join requests</value>
<data name="UserSummary_JoinRequests" xml:space="preserve">
<value>Join requests</value>
</data>
<data name="UserSummary_Approve" xml:space="preserve">
<value>Approve</value>
<value>Approve</value>
</data>
<data name="UserSummary_TotalUsers" xml:space="preserve">
<value>Organisation has {0} {1}</value>
<value>Organisation has {0} {1}</value>
</data>
<data name="UserSummary_User" xml:space="preserve">
<value>user</value>
<value>user</value>
</data>
<data name="UserSummary_Users" xml:space="preserve">
<value>users</value>
<data name="UserSummary_Users" xml:space="preserve">
<value>users</value>
</data>
<data name="UserSummary_InviteExpired" xml:space="preserve">
<value>Invite expired</value>
Expand All @@ -2987,9 +2975,6 @@
<data name="UserSummary_AddAnotherUser" xml:space="preserve">
<value>Add another user?</value>
</data>
<data name="UserSummary_Resend" xml:space="preserve">
<value>Resend</value>
</data>
<data name="Users_FirstName_Label" xml:space="preserve">
<value>First name</value>
</data>
Expand Down Expand Up @@ -3026,19 +3011,9 @@
<data name="Users_CheckYourAnswers_Title" xml:space="preserve">
<value>Check your answers</value>
</data>
<data name="Users_SendEmail_Button" xml:space="preserve">
<value>Send email</value>
</data>

<data name="Users_SendEmail_Button" xml:space="preserve">
<value>Join requests</value>
</data>

<data name="Users_SendEmail_Button" xml:space="preserve">
<value>Join requests</value>
</data>


<data name="ErrorMessageList_DuplicatePersonName" xml:space="preserve">
<value>A person with this name already exists. Please try again.</value>
</data>
Expand Down Expand Up @@ -3123,4 +3098,7 @@
<data name="ErrorMessageList_IdentiferNumberAlreadyExists" xml:space="preserve">
<value>You’ve used this registry number for another organisation. Enter a different registry number.</value>
</data>
<data name="ErrorMessageList_MouNotFound" xml:space="preserve">
<value>Mou not found</value>
</data>
</root>
Loading
Loading