Compare commits
2 Commits
e082a6ef06
...
v1.9.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
596d21712a | ||
|
|
b504d9d0b2 |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "app-ts",
|
||||
"version": "1.9.7",
|
||||
"version": "1.9.8",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "app-ts",
|
||||
"version": "1.9.7",
|
||||
"version": "1.9.8",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@dnd-kit/core": "^6.3.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "app-ts",
|
||||
"version": "1.9.7",
|
||||
"version": "1.9.8",
|
||||
"description": "",
|
||||
"main": "dist/server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -58,6 +58,7 @@ interface NativeInputProps {
|
||||
minDate?: string;
|
||||
maxDate?: string;
|
||||
disabled?: boolean;
|
||||
placeholder?: string;
|
||||
}
|
||||
|
||||
const modeToInputType: Record<string, string> = {
|
||||
@@ -73,6 +74,7 @@ function NativeInput({
|
||||
minDate,
|
||||
maxDate,
|
||||
disabled,
|
||||
placeholder,
|
||||
}: NativeInputProps) {
|
||||
const type = modeToInputType[mode] || "date";
|
||||
// For time inputs, min/max must be in HH:mm format, not date format
|
||||
@@ -95,6 +97,7 @@ function NativeInput({
|
||||
value={value || ""}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
className="admin-form-input"
|
||||
placeholder={placeholder}
|
||||
required={required}
|
||||
disabled={disabled}
|
||||
min={minProp}
|
||||
@@ -126,6 +129,12 @@ export default function AdminDatePicker({
|
||||
}: AdminDatePickerProps) {
|
||||
const useNative = isTouchDevice();
|
||||
|
||||
// Mode-aware default placeholder so empty date fields always show a format
|
||||
// hint (callers can still override, e.g. "Od"/"Do" on range filters).
|
||||
const effectivePlaceholder =
|
||||
placeholder ??
|
||||
(mode === "time" ? "hh:mm" : mode === "month" ? "mm.rrrr" : "dd.mm.rrrr");
|
||||
|
||||
if (useNative) {
|
||||
return (
|
||||
<NativeInput
|
||||
@@ -136,6 +145,7 @@ export default function AdminDatePicker({
|
||||
minDate={minDate}
|
||||
maxDate={maxDate}
|
||||
disabled={disabled}
|
||||
placeholder={effectivePlaceholder}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -181,7 +191,7 @@ export default function AdminDatePicker({
|
||||
const customInput = (
|
||||
<CustomInput
|
||||
required={required}
|
||||
placeholder={placeholder}
|
||||
placeholder={effectivePlaceholder}
|
||||
disabled={disabled}
|
||||
/>
|
||||
);
|
||||
@@ -191,7 +201,7 @@ export default function AdminDatePicker({
|
||||
onChange: handleChange,
|
||||
locale: "cs",
|
||||
customInput,
|
||||
placeholderText: placeholder,
|
||||
placeholderText: effectivePlaceholder,
|
||||
minDate: parseMinMax(minDate),
|
||||
maxDate: parseMinMax(maxDate),
|
||||
popperPlacement: "bottom-start" as const,
|
||||
|
||||
@@ -8,6 +8,7 @@ import { motion } from "framer-motion";
|
||||
import ConfirmModal from "../components/ConfirmModal";
|
||||
import FormModal from "../components/FormModal";
|
||||
import FormField from "../components/FormField";
|
||||
import AdminDatePicker from "../components/AdminDatePicker";
|
||||
|
||||
import { formatDate, czechPlural } from "../utils/formatters";
|
||||
import SortIcon from "../components/SortIcon";
|
||||
@@ -530,23 +531,21 @@ export default function Projects() {
|
||||
|
||||
<div className="admin-form-row">
|
||||
<FormField label="Začátek">
|
||||
<input
|
||||
type="date"
|
||||
<AdminDatePicker
|
||||
mode="date"
|
||||
value={createForm.start_date}
|
||||
onChange={(e) =>
|
||||
setCreateForm({ ...createForm, start_date: e.target.value })
|
||||
onChange={(val) =>
|
||||
setCreateForm({ ...createForm, start_date: val })
|
||||
}
|
||||
className="admin-form-input"
|
||||
/>
|
||||
</FormField>
|
||||
<FormField label="Konec">
|
||||
<input
|
||||
type="date"
|
||||
<AdminDatePicker
|
||||
mode="date"
|
||||
value={createForm.end_date}
|
||||
onChange={(e) =>
|
||||
setCreateForm({ ...createForm, end_date: e.target.value })
|
||||
onChange={(val) =>
|
||||
setCreateForm({ ...createForm, end_date: val })
|
||||
}
|
||||
className="admin-form-input"
|
||||
/>
|
||||
</FormField>
|
||||
</div>
|
||||
|
||||
@@ -378,7 +378,6 @@ export default function WarehouseReceiptForm() {
|
||||
delivery_note_date: val,
|
||||
}))
|
||||
}
|
||||
placeholder="dd.mm.yyyy"
|
||||
/>
|
||||
</FormField>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user