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.

Sign up for GitHub

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

Notify & Issue Status #2719

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Notify & Issue Status #2719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
921a9e3
Add notify functions
DitriXNew Jan 12, 2025
fc1dc72
Add statuses to Issue
DitriXNew Jan 12, 2025
b497108
Fill Issue status from mobile
DitriXNew Jan 12, 2025
17863b9
fix add photo
DitriXNew Jan 12, 2025
d4fd41b
Add on change Assignee - add info for waiting on open
DitriXNew Jan 12, 2025
c44cda3
Conver Assignee as List
DitriXNew Jan 12, 2025
adbb97f
fix features
Severnity Jan 14, 2025
d90b3e5
Update TestDataBase.feature
Severnity Jan 14, 2025
ca8af9a
fix units
DitriXNew Jan 15, 2025
a5dd8cb
fix features
Severnity Jan 15, 2025
5159dfb
Merge branch 'develop' into notify
Severnity Jan 15, 2025
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
44 changes: 42 additions & 2 deletions IRP/src/Catalogs/ObjectLocations/Forms/ChoiceForm/Form.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,8 @@
Table

WHERE
CASE WHEN &CityIsSet AND Table.IsFolder THEN
Table.City = &City
CASE WHEN &CityIsSet THEN
Table.City = &City OR Table.Parent.City = &City
ELSE
TRUE
END
Expand Down Expand Up @@ -490,6 +490,46 @@ END
<dataPath>PredefinedDataName</dataPath>
<field>PredefinedDataName</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>Latitude</dataPath>
<field>Latitude</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>Longitude</dataPath>
<field>Longitude</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>DefaultPartner</dataPath>
<field>DefaultPartner</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>AddAttributes</dataPath>
<field>AddAttributes</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>Editor</dataPath>
<field>Editor</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>NotActive</dataPath>
<field>NotActive</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>SourceNodeID</dataPath>
<field>SourceNodeID</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>Author</dataPath>
<field>Author</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>ModifyDate</dataPath>
<field>ModifyDate</field>
</fields>
<fields xsi:type="schema:DataCompositionSchemaDataSetField">
<dataPath>CreateDate</dataPath>
<field>CreateDate</field>
</fields>
<parameters>
<name>CityIsSet</name>
<title>
Expand Down
50 changes: 50 additions & 0 deletions IRP/src/Catalogs/ObjectLocations/Forms/ItemForm/Form.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,56 @@
<textEdit>true</textEdit>
</extInfo>
</items>
<items xsi:type="form:FormField">
<name>City</name>
<id>19</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<dataPath xsi:type="form:DataPath">
<segments>Object.City</segments>
</dataPath>
<extendedTooltip>
<name>CityExtendedTooltip</name>
<id>21</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<type>Label</type>
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<extInfo xsi:type="form:LabelDecorationExtInfo">
<horizontalAlign>Left</horizontalAlign>
</extInfo>
</extendedTooltip>
<contextMenu>
<name>CityContextMenu</name>
<id>20</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<autoFill>true</autoFill>
</contextMenu>
<type>InputField</type>
<editMode>Enter</editMode>
<showInHeader>true</showInHeader>
<headerHorizontalAlign>Left</headerHorizontalAlign>
<showInFooter>true</showInFooter>
<extInfo xsi:type="form:InputFieldExtInfo">
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<wrap>true</wrap>
<chooseType>true</chooseType>
<typeDomainEnabled>true</typeDomainEnabled>
<textEdit>true</textEdit>
</extInfo>
</items>
<items xsi:type="form:FormField">
<name>Latitude</name>
<id>10</id>
Expand Down
2 changes: 1 addition & 1 deletion IRP/src/Catalogs/ObjectLocations/ObjectLocations.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<fillChecking>ShowError</fillChecking>
<fillValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
<use>ForFolder</use>
<use>ForFolderAndItem</use>
<dataHistory>Use</dataHistory>
</attributes>
<attributes uuid="b4a86a27-1779-45bd-87f7-c7af6c3425e2">
Expand Down
40 changes: 24 additions & 16 deletions IRP/src/Catalogs/ObjectStatuses/ObjectStatuses.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,111 +147,119 @@
<items id="e171ffad-e13a-4e2e-9319-9037bec5904d">
<name>SalesOrder</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>1</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="72d5c9d9-a3f0-42c2-87f0-169d621fae5e">
<name>SalesReturnOrder</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>2</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="2a12c8b2-ef6e-485d-9e7b-11932d60003b">
<name>PurchaseOrder</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>3</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="a8559087-bcb5-408a-b346-99a24f2cc035">
<name>PurchaseReturnOrder</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>4</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="4bca0f62-13eb-4af1-ba7b-7de74bfc953a">
<name>InventoryTransferOrder</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>5</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="d16d1352-b5bc-4397-af42-16678054bcea">
<name>OutgoingPaymentOrder</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>6</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="e904823b-2419-48d9-9136-b230e4da8a3b">
<name>ReconciliationStatement</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>7</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="748479bd-dbd2-459d-ac53-92c750c6505d">
<name>PhysicalCountByLocation</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>8</value>
</code>
<isFolder>true</isFolder>
<content id="94db2442-3d9d-4627-ae9e-5d83003e1aec">
<name>Complete</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>9</value>
</code>
</content>
</items>
<items id="83a9eeaa-a8f6-4fa4-9496-74fd8b74d65a">
<name>PhysicalInventory</name>
<code xsi:type="core:NumberValue">
<value>0</value>
<value>10</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="e25ea91f-552c-4a7b-bf52-23e520acf75c">
<name>IncomingPaymentOrder</name>
<code xsi:type="core:NumberValue">
<value>1</value>
<value>11</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="faf693e3-fdc9-4a9a-adc6-0a0587fc1fe1">
<name>ChequeBondTransaction</name>
<code xsi:type="core:NumberValue">
<value>2</value>
<value>12</value>
</code>
<isFolder>true</isFolder>
<content id="0dfc1880-03ff-45a5-b8dd-a854fdfc404b">
<name>ChequeBondIncoming</name>
<code xsi:type="core:NumberValue">
<value>3</value>
<value>13</value>
</code>
<isFolder>true</isFolder>
</content>
<content id="6f439a66-f031-44d3-bbc6-03e70ac9630d">
<name>ChequeBondOutgoing</name>
<code xsi:type="core:NumberValue">
<value>4</value>
<value>14</value>
</code>
<isFolder>true</isFolder>
</content>
</items>
<items id="81751930-0f6e-4303-903f-f1d1e2ed8b19">
<name>WorkOrder</name>
<code xsi:type="core:NumberValue">
<value>5</value>
<value>15</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="ac8cd136-f90f-430a-99b8-7b5e1b871a9f">
<name>ProductionPlanningCorrection</name>
<code xsi:type="core:NumberValue">
<value>6</value>
<value>16</value>
</code>
<isFolder>true</isFolder>
</items>
<items id="c92b2538-ea10-4d1d-b8ef-7359c555cfe3">
<name>Issue</name>
<description></description>
<code xsi:type="core:NumberValue">
<value>17</value>
</code>
<isFolder>true</isFolder>
</items>
Expand Down
21 changes: 21 additions & 0 deletions IRP/src/CommonModules/CommonFunctionsServer/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,27 @@ Function JoinTables(ArrayOfJoiningTables, Fields) Export
EndIf;
EndFunction

// Table to structure.
//
// Parameters:
// Table - ValueTable - Table
//
// Returns:
// Array Of Structure
Function TableToStructure(Table) Export
Array = New Array; // Array Of Structure

For Each Row In Table Do
Str = New Structure;
For Each Column In Table.Columns Do
Str.Insert(Column.Name, Row[Column.Name]);
EndDo;
Array.Add(Str);
EndDo;

Return Array;
EndFunction

// Merge tables.
//
// Parameters:
Expand Down
10 changes: 10 additions & 0 deletions IRP/src/CommonModules/DocIssueClient/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ Procedure DateOnChange(Object, Form, Item) Export
EndProcedure

#EndRegion

#Region STATUS

Procedure StatusOnChange(Object, Form, Item) Export
#If Not MobileClient Then
ViewClient_V2.StatusOnChange(Object, Form);
#EndIf
EndProcedure

#EndRegion
26 changes: 1 addition & 25 deletions IRP/src/CommonModules/DocIssueServer/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,19 @@

Procedure OnCreateAtServer(Object, Form, Cancel, StandardProcessing) Export
DocumentsServer.OnCreateAtServer(Object, Form, Cancel, StandardProcessing);
If Form.Parameters.Key.IsEmpty() Then
SetGroupItemsList(Object, Form);
DocumentsClientServer.ChangeTitleGroupTitle(Object, Form);
EndIf;
ViewServer_V2.OnCreateAtServer(Object, Form, "");
EndProcedure

Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export
DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form);
Return;
EndProcedure

Procedure OnReadAtServer(Object, Form, CurrentObject) Export
If Not Form.GroupItems.Count() Then
SetGroupItemsList(Object, Form);
EndIf;
DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form);
LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject);
EndProcedure

#EndRegion

#Region _TITLE

Procedure SetGroupItemsList(Object, Form)
AttributesArray = New Array();
AttributesArray.Add("City");
AttributesArray.Add("Location");
AttributesArray.Add("IssueType");
DocumentsServer.DeleteUnavailableTitleItemNames(AttributesArray);
For Each Attr In AttributesArray Do
Form.GroupItems.Add(Attr, ?(ValueIsFilled(Form.Items[Attr].Title), Form.Items[Attr].Title,
Object.Ref.Metadata().Attributes[Attr].Synonym + ":" + Chars.NBSp));
EndDo;
EndProcedure

#EndRegion

#Region LIST_FORM

Procedure OnCreateAtServerListForm(Form, Cancel, StandardProcessing) Export
Expand Down
4 changes: 4 additions & 0 deletions IRP/src/CommonModules/DocumentsClientServer/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ Procedure ChangeTitleGroupTitle(Object, Form, Settings = Undefined) Export
Return;
EndIf;

If Form.Items.Find("DecorationGroupTitleCollapsedLabel") = Undefined Then
Return;
EndIf;

ItemsArray = GetGroupItemsArray(Object, Form);

If Not ItemsArray.Count() Then
Expand Down
3 changes: 3 additions & 0 deletions IRP/src/CommonModules/Localization/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,6 +2286,9 @@ Strings.Insert("ExternalAccountingOperationExchangeReport", NStr("en = 'External
#Region Issue
Strings.Insert("Issue_1", NStr("en = 'Issues were already created for all locations.'", Lang));
Strings.Insert("Issue_2", NStr("en = 'Create issue for locations: %1?'", Lang));
Strings.Insert("Issue_3", NStr("en = 'Issue was created'", Lang));
Strings.Insert("Issue_4", NStr("en = 'Issue was canceled'", Lang));
Strings.Insert("Issue_5", NStr("en = 'Add new assignee'", Lang));
#EndRegion
Return Strings;
EndFunction
10 changes: 10 additions & 0 deletions IRP/src/CommonModules/LoggerServerCall/LoggerServerCall.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdclass:CommonModule xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="6661a314-c96e-437b-85d6-d20ee51477dd">
<name>LoggerServerCall</name>
<synonym>
<key>en</key>
<value>Log</value>
</synonym>
<server>true</server>
<serverCall>true</serverCall>
</mdclass:CommonModule>
Loading