Skip to content

DONT MERGE: Primeng 18 with Lara Theme #31321

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

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e123f51
Fix this
fmontes Feb 6, 2025
0eba1c1
refactor(primeng): Replace deprecated InputTextareaModule with Textar…
fmontes Feb 6, 2025
22f374d
refactor(primeng): Replace DynamicDialogModule with DynamicDialog
fmontes Feb 6, 2025
1325de0
refactor(primeng): Remove label prop from p-checkbox
fmontes Feb 6, 2025
41cc4f6
refactor(primeng): Improve checkbox and radio button accessibility an…
fmontes Feb 6, 2025
8a317ba
refactor(primeng): Replace ChipsModule with Chip in autocomplete tags…
fmontes Feb 6, 2025
bb91acf
refactor(primeng): Update DotAlertConfirmComponent method calls
fmontes Feb 6, 2025
cc8dc5f
clean up crazy cursor code
fmontes Feb 6, 2025
53c36e7
refactor(ui): Update UI components and styling with PrimeNG and Lato …
fmontes Feb 6, 2025
af7c76e
refactor(primeng): Update tabview classes to p-tabs in multiple compo…
fmontes Feb 6, 2025
216d0ef
Merge branch 'main' into primeng-ui
fmontes Feb 11, 2025
e3b1389
Merge branch 'main' into primeng-ui
fmontes Feb 12, 2025
323802a
Merge branch 'main' into primeng-ui
fmontes Feb 13, 2025
b902359
Merge branch 'main' into primeng-ui
fmontes Feb 18, 2025
e2f4b71
Merge branch 'main' into primeng-ui
fmontes Feb 24, 2025
e3641e4
Merge branch 'main' into primeng-ui
nicobytes Feb 25, 2025
813c636
Fix: Record Content-Type of Binary Fields Correctly in Events (#31451)
freddyDOTCMS Feb 25, 2025
5a3a106
#28422: Rebalancing ITs again part 2 (#31421)
victoralfaro-dotcms Feb 25, 2025
b479e58
fix(FTM): avoid executing ftm logic for immediate publish date in liv…
valentinogiardino Feb 25, 2025
c23fe90
#31452: removing fallback restore keys for release process (#31453)
victoralfaro-dotcms Feb 25, 2025
2d39404
fix(Page) Broken Assets Loading LIVE Mode Refs: #31402 (#31455)
fabrizzio-dotCMS Feb 25, 2025
07a4bee
refactor(data-access): Improve error message extraction in HTTP error…
nicobytes Feb 25, 2025
0993b83
fix(uve): Fixed iframeURL selector on store (#31470)
KevinDavilaDotCMS Feb 25, 2025
705603f
feat(Content Analytics) #31319 : Add telemetry customer category, cus…
jcastro-dotcms Feb 26, 2025
b2ad4d5
Script to report lead time to change for GH issues (#31479)
dsilvam Feb 26, 2025
4a31356
Issue 31420 datetool (#31447)
jdotcms Feb 26, 2025
db10cd7
Merge branch 'main' into primeng-ui
fmontes Feb 27, 2025
c03c528
Merge branch 'main' into primeng-ui
fmontes Feb 28, 2025
5b1bbc5
Merge branch 'main' into primeng-ui
fmontes Mar 3, 2025
c24a906
Merge branch 'main' into primeng-ui
fmontes Mar 6, 2025
a23153e
Merge branch 'main' into primeng-ui
fmontes Mar 7, 2025
567462b
Merge branch 'main' into primeng-ui
fmontes Mar 10, 2025
7927449
Merge branch 'main' into primeng-ui
fmontes Mar 12, 2025
f627339
Merge branch 'main' into primeng-ui
fmontes Mar 18, 2025
d8720a1
Merge branch 'main' into primeng-ui
fmontes Mar 25, 2025
9d03875
Merge branch 'main' into primeng-ui
fmontes Apr 1, 2025
0742a59
Merge branch 'main' into primeng-ui
fmontes Apr 4, 2025
cfb16a9
Merge branch 'main' into primeng-ui
fmontes Apr 9, 2025
43350f2
Merge branch 'main' into primeng-ui
fmontes Apr 21, 2025
c4c15f2
Merge branch 'main' into primeng-ui
fmontes Apr 24, 2025
2e1f1e0
Merge branch 'main' into primeng-ui
fmontes May 8, 2025
7269db9
Merge branch 'main' into primeng-ui
fmontes May 12, 2025
6a55c9a
Merge branch 'main' into primeng-ui
fmontes May 22, 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
Prev Previous commit
Next Next commit
Issue 31420 datetool (#31447)
now the dateTool support toTimeStamp
  • Loading branch information
jdotcms authored and fmontes committed Feb 26, 2025
commit 4a3135655600cbd5bcd509933a7699964396a8db
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@


import java.lang.reflect.Field;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
Expand Down Expand Up @@ -828,6 +829,81 @@ public Date toDate(String format, Object obj,
}
}

////////////

/**
* Converts an object to an instance of {@link Timestamp} using the
* format returned by {@link #getFormat()},the {@link Locale} returned
* by {@link #getLocale()}, and the {@link TimeZone} returned by
* {@link #getTimeZone()} if the object is not already an instance
* of Date, Calendar, or Long.
*
* @param obj the date to convert
* @return the object as a {@link Timestamp} or <code>null</code> if no
* conversion is possible
*/
public Timestamp toTimestamp(final Object obj)
{
return new Timestamp(toDate(obj).getTime());
}

/**
* Converts an object to an instance of {@link Timestamp} using the
* specified format,the {@link Locale} returned by
* {@link #getLocale()}, and the {@link TimeZone} returned by
* {@link #getTimeZone()} if the object is not already an instance
* of Date, Calendar, or Long.
*
* @param format - the format the date is in
* @param obj - the date to convert
* @return the object as a {@link Timestamp} or <code>null</code> if no
* conversion is possible
* @see #toDate(String format, Object obj, Locale locale)
*/
public Timestamp toTimestamp(final String format, final Object obj)
{
return new Timestamp(toDate(format, obj).getTime());
}

/**
* Converts an object to an instance of {@link Timestamp} using the
* specified format and {@link Locale} if the object is not already
* an instance of Date, Calendar, or Long.
*
* @param format - the format the date is in
* @param obj - the date to convert
* @param locale - the {@link Locale}
* @return the object as a {@link Timestamp} or <code>null</code> if no
* conversion is possible
* @see SimpleDateFormat#parse
*/
public Timestamp toTimestamp(final String format, final Object obj, final Locale locale)
{
return new Timestamp(toDate(format, obj, locale).getTime());
}

/**
* Converts an object to an instance of {@link Timestamp} using the
* specified format, {@link Locale}, and {@link TimeZone} if the
* object is not already an instance of Date, Calendar, or Long.
*
* @param format - the format the date is in
* @param obj - the date to convert
* @param locale - the {@link Locale}
* @param timezone - the {@link TimeZone}
* @return the object as a {@link Timestamp} or <code>null</code> if no
* conversion is possible
* @see #getDateFormat
* @see SimpleDateFormat#parse
*/
public Timestamp toTimestamp(final String format, final Object obj,
final Locale locale, final TimeZone timezone)
{
return new Timestamp(toDate(format, obj, locale, timezone).getTime());
}

///////////

/**
* Converts an object to an instance of {@link Calendar} using the
* locale returned by {@link #getLocale()} if necessary.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"info": {
"_postman_id": "04e24c3e-7d51-4e2b-be4a-e63094ab158d",
"name": "DateTool",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
"_exporter_id": "781456"
},
"item": [
{
"name": "TestToTimeStamp",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test(\"Status code should be 200\", function () {",
" pm.response.to.have.status(200);",
"});",
"",
"var text = pm.response.text()",
"",
"pm.test(\"Right date\", function () {",
" pm.expect(text).to.be.eql('2025-02-06 00:00:00.0');",
"});",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{jwt}}",
"type": "string"
}
]
},
"method": "POST",
"header": [],
"body": {
"mode": "raw",
"raw": "$date.toTimestamp('yyyy-MM-dd','2025-02-06')",
"options": {
"raw": {
"language": "json"
}
}
},
"url": {
"raw": "{{serverURL}}/api/vtl/dynamic/",
"host": [
"{{serverURL}}"
],
"path": [
"api",
"vtl",
"dynamic",
""
]
}
},
"response": []
}
]
}
Loading