This commit is contained in:
ISA
2025-06-27 07:12:01 +02:00
parent c558b9b826
commit 7da872ae07
8 changed files with 23 additions and 15 deletions

View File

@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_EXPORT_STATIC=false
NEXT_PUBLIC_USE_CGI=false NEXT_PUBLIC_USE_CGI=false
# App-Versionsnummer # App-Versionsnummer
NEXT_PUBLIC_APP_VERSION=1.6.485 NEXT_PUBLIC_APP_VERSION=1.6.486
NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)

View File

@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_EXPORT_STATIC=true
NEXT_PUBLIC_USE_CGI=true NEXT_PUBLIC_USE_CGI=true
# App-Versionsnummer # App-Versionsnummer
NEXT_PUBLIC_APP_VERSION=1.6.485 NEXT_PUBLIC_APP_VERSION=1.6.486
NEXT_PUBLIC_CPL_MODE=production NEXT_PUBLIC_CPL_MODE=production

View File

@@ -1,3 +1,8 @@
## [1.6.486] 2025-06-27
- refactor: rename einausgange to digitalOtputs and digitalInputs
---
## [1.6.485] 2025-06-27 ## [1.6.485] 2025-06-27
- esLint - esLint

View File

@@ -18,7 +18,10 @@ type Props = {
inputRange: { start: number; end: number }; inputRange: { start: number; end: number };
}; };
export default function DigitalInputs({ openInputModal, inputRange }: Props) { export default function DigitalInputsWidget({
openInputModal,
inputRange,
}: Props) {
const digitalInputs = useSelector( const digitalInputs = useSelector(
(state: RootState) => state.digitalInputsSlice.inputs (state: RootState) => state.digitalInputsSlice.inputs
); );

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.485", "version": "1.6.486",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.485", "version": "1.6.486",
"dependencies": { "dependencies": {
"@fontsource/roboto": "^5.1.0", "@fontsource/roboto": "^5.1.0",
"@iconify-icons/ri": "^1.2.10", "@iconify-icons/ri": "^1.2.10",

View File

@@ -1,6 +1,6 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.485", "version": "1.6.486",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@@ -8,9 +8,9 @@ import InputModal from "@/components/main/digitalInputs/digitalInputsModal";
import { getDigitalInputsThunk } from "@/redux/thunks/getDigitalInputsThunk"; import { getDigitalInputsThunk } from "@/redux/thunks/getDigitalInputsThunk";
import DigitalInputs from "@/components/main/digitalInputs/DigitalInputsWidget"; import DigitalInputsWidget from "@/components/main/digitalInputs/DigitalInputsWidget";
const digitalInputs: React.FC = () => { const DigitalInputs: React.FC = () => {
const dispatch = useDispatch<AppDispatch>(); const dispatch = useDispatch<AppDispatch>();
interface DigitalInput { interface DigitalInput {
id: number; id: number;
@@ -49,11 +49,11 @@ const digitalInputs: React.FC = () => {
<h1 className="text-base font-semibold mb-2">Meldungseingänge</h1> <h1 className="text-base font-semibold mb-2">Meldungseingänge</h1>
<div className="grid grid-cols-1 xl:grid-cols-3 gap-4 items-start "> <div className="grid grid-cols-1 xl:grid-cols-3 gap-4 items-start ">
<DigitalInputs <DigitalInputsWidget
openInputModal={openInputModal} openInputModal={openInputModal}
inputRange={{ start: 0, end: 16 }} inputRange={{ start: 0, end: 16 }}
/> />
<DigitalInputs <DigitalInputsWidget
openInputModal={openInputModal} openInputModal={openInputModal}
inputRange={{ start: 16, end: 32 }} inputRange={{ start: 16, end: 32 }}
/> />
@@ -70,4 +70,4 @@ const digitalInputs: React.FC = () => {
); );
}; };
export default digitalInputs; export default DigitalInputs;

View File

@@ -5,14 +5,14 @@ import { useDispatch } from "react-redux";
import { AppDispatch } from "@/redux/store"; import { AppDispatch } from "@/redux/store";
import DigitalOutputsModal from "../components/main/digitalOutputs/DigitalOutputsModal"; import DigitalOutputsModal from "../components/main/digitalOutputs/DigitalOutputsModal";
import DigitalOutputs from "../components/main/digitalOutputs/DigitalOutputsWidget"; import DigitalOutputsWidget from "../components/main/digitalOutputs/DigitalOutputsWidget";
import { getDigitalInputsThunk } from "@/redux/thunks/getDigitalInputsThunk"; import { getDigitalInputsThunk } from "@/redux/thunks/getDigitalInputsThunk";
import { getDigitalOutputsThunk } from "@/redux/thunks/getDigitalOutputsThunk"; import { getDigitalOutputsThunk } from "@/redux/thunks/getDigitalOutputsThunk";
import type { DigitalOutput } from "@/types/digitalOutput"; import type { DigitalOutput } from "@/types/digitalOutput";
const digitalOutputs: React.FC = () => { const DigitalOutputs: React.FC = () => {
const dispatch = useDispatch<AppDispatch>(); const dispatch = useDispatch<AppDispatch>();
const [selectedOutput, setSelectedOutput] = useState<DigitalOutput | null>( const [selectedOutput, setSelectedOutput] = useState<DigitalOutput | null>(
null null
@@ -45,7 +45,7 @@ const digitalOutputs: React.FC = () => {
<h1 className="text-base font-semibold mb-2">Schaltausgänge</h1> <h1 className="text-base font-semibold mb-2">Schaltausgänge</h1>
<div className="grid grid-cols-1 xl:grid-cols-3 gap-4 items-start"> <div className="grid grid-cols-1 xl:grid-cols-3 gap-4 items-start">
<DigitalOutputs openOutputModal={openOutputModal} /> <DigitalOutputsWidget openOutputModal={openOutputModal} />
</div> </div>
{selectedOutput && ( {selectedOutput && (
@@ -59,4 +59,4 @@ const digitalOutputs: React.FC = () => {
); );
}; };
export default digitalOutputs; export default DigitalOutputs;