Skip to content

Commit a3ba5c9

Browse files
committed
LUT-25865 : add category and generic status
1 parent 19ac58c commit a3ba5c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1392
-856
lines changed

src/java/fr/paris/lutece/plugins/grubusiness/business/customer/Customer.java

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002-2017, Mairie de Paris
2+
* Copyright (c) 2002-2024, City of Paris
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -84,9 +84,13 @@ public class Customer implements Serializable
8484
private String _strAccountLogin;
8585

8686
/** The connection Id. */
87-
@Size( max = 50, message = "#i18n{gru.validation.customer.AccountGuid.size}" )
87+
@Size( max = 56, message = "#i18n{gru.validation.customer.AccountGuid.size}" )
8888
private String _strConnectionId;
8989

90+
/** The customer Id. */
91+
@Size( max = 50, message = "#i18n{gru.validation.customer.AccountCuid.size}" )
92+
private String _strCustomerId;
93+
9094
/** The _str email. */
9195
@Email( message = "#i18n{portal.validation.message.email}" )
9296
@Size( max = 255, message = "#i18n{gru.validation.customer.Email.size}" )
@@ -298,6 +302,29 @@ public void setConnectionId( String strConnectionId )
298302
_strConnectionId = strConnectionId;
299303
}
300304

305+
/**
306+
* Returns the Customer Id.
307+
*
308+
* @return The Customer Id
309+
*/
310+
@JsonProperty( "customer_id" )
311+
public String getCustomerId( )
312+
{
313+
return _strCustomerId;
314+
}
315+
316+
/**
317+
* Sets the Customer id.
318+
*
319+
* @param strCustomerId
320+
* The Customer Id
321+
*/
322+
@JsonProperty( "customer_id" )
323+
public void setCustomerId( String strCustomerId )
324+
{
325+
_strCustomerId = strCustomerId;
326+
}
327+
301328
/**
302329
* Returns the Email.
303330
*

src/java/fr/paris/lutece/plugins/grubusiness/business/customer/CustomerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002-2017, Mairie de Paris
2+
* Copyright (c) 2002-2024, City of Paris
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/java/fr/paris/lutece/plugins/grubusiness/business/customer/ICustomerDAO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002-2017, Mairie de Paris
2+
* Copyright (c) 2002-2024, City of Paris
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/java/fr/paris/lutece/plugins/grubusiness/business/demand/Action.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002-2017, Mairie de Paris
2+
* Copyright (c) 2002-2024, City of Paris
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/java/fr/paris/lutece/plugins/grubusiness/business/demand/Demand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002-2017, Mairie de Paris
2+
* Copyright (c) 2002-2024, City of Paris
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -431,7 +431,8 @@ public long getModifyDate( )
431431
}
432432

433433
/**
434-
* @param lModifyDate the _lModifyDate to set
434+
* @param lModifyDate
435+
* the _lModifyDate to set
435436
*/
436437
public void setModifyDate( long lModifyDate )
437438
{
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
/*
2+
* Copyright (c) 2002-2024, City of Paris
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without
6+
* modification, are permitted provided that the following conditions
7+
* are met:
8+
*
9+
* 1. Redistributions of source code must retain the above copyright notice
10+
* and the following disclaimer.
11+
*
12+
* 2. Redistributions in binary form must reproduce the above copyright notice
13+
* and the following disclaimer in the documentation and/or other materials
14+
* provided with the distribution.
15+
*
16+
* 3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
17+
* contributors may be used to endorse or promote products derived from
18+
* this software without specific prior written permission.
19+
*
20+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
24+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30+
* POSSIBILITY OF SUCH DAMAGE.
31+
*
32+
* License 1.0
33+
*/
34+
package fr.paris.lutece.plugins.grubusiness.business.demand;
35+
36+
import javax.validation.constraints.Size;
37+
import javax.validation.constraints.NotEmpty;
38+
import java.io.Serializable;
39+
40+
/**
41+
* This is the business class for the object DemandCategory
42+
*/
43+
public class DemandCategory implements Serializable
44+
{
45+
private static final long serialVersionUID = 1L;
46+
47+
// Variables declarations
48+
private int _nId;
49+
50+
@NotEmpty( message = "#i18n{grusupply.validation.demandcategory.Code.notEmpty}" )
51+
@Size( max = 255, message = "#i18n{grusupply.validation.demandcategory.Code.size}" )
52+
private String _strCode;
53+
54+
@NotEmpty( message = "#i18n{grusupply.validation.demandcategory.Label.notEmpty}" )
55+
private String _strLabel;
56+
57+
/**
58+
* Returns the Id
59+
*
60+
* @return The Id
61+
*/
62+
public int getId( )
63+
{
64+
return _nId;
65+
}
66+
67+
/**
68+
* Sets the Id
69+
*
70+
* @param nId
71+
* The Id
72+
*/
73+
public void setId( int nId )
74+
{
75+
_nId = nId;
76+
}
77+
78+
/**
79+
* Returns the Code
80+
*
81+
* @return The Code
82+
*/
83+
public String getCode( )
84+
{
85+
return _strCode;
86+
}
87+
88+
/**
89+
* Sets the Code
90+
*
91+
* @param strCode
92+
* The Code
93+
*/
94+
public void setCode( String strCode )
95+
{
96+
_strCode = strCode;
97+
}
98+
99+
/**
100+
* Returns the Label
101+
*
102+
* @return The Label
103+
*/
104+
public String getLabel( )
105+
{
106+
return _strLabel;
107+
}
108+
109+
/**
110+
* Sets the Label
111+
*
112+
* @param strLabel
113+
* The Label
114+
*/
115+
public void setLabel( String strLabel )
116+
{
117+
_strLabel = strLabel;
118+
}
119+
120+
}

0 commit comments

Comments
 (0)