- 
Harmonogram
+
+
+ 
+ Wydatki
+
+
+
+ 
+ Raporty
+
);
diff --git a/firm/src/components/Transakcje.js b/firm/src/components/Transakcje.js
index ea8a15a..bd03aea 100644
--- a/firm/src/components/Transakcje.js
+++ b/firm/src/components/Transakcje.js
@@ -1,22 +1,30 @@
import React, { useState, useEffect } from 'react';
import axios from 'axios';
+import Select from 'react-select';
import editIcon from "../icons/edit.png";
import koszIcon from "../icons/kosz.png";
import plusIcon from "../icons/plus.png";
+import ConfirmationModal from './ConfirmationModal';
const Transakcje = () => {
const [transactions, setTransactions] = useState([]);
const [isModalOpen, setIsModalOpen] = useState(false);
+ const [isEditModalOpen, setIsEditModalOpen] = useState(false);
+ const [editTransaction, setEditTransaction] = useState(null);
+ const [error, setError] = useState(null);
+ const [products, setProducts] = useState([]);
+ const [deleteTransactionId, setDeleteTransactionId] = useState(null);
const [newTransaction, setNewTransaction] = useState({
- id: 1,
+ id: 2,
date: "",
employeeId: "",
transactionProducts: [
{
id: 0,
- transactionId: 0,
- productID: "",
- quantity:""
+ transactionId: 2,
+ productID: 0,
+ productName: "",
+ quantity: ""
}
],
paymentType: "",
@@ -30,28 +38,41 @@ const Transakcje = () => {
const response = await axios.get('https://localhost:7039/api/Transaction');
setTransactions(response.data);
} catch (error) {
- console.error('Błąd podczas pobierania transakcji:', error);
+ console.error('Błąd podczas dodawania transakcji:', error);
+ }
+ };
+ const fetchProducts = async () => {
+ try {
+ const response = await axios.get('https://localhost:7039/api/Products');
+ setProducts(response.data.map(product => ({ value: product.id, label: product.name })));
+ } catch (error) {
+ console.error('Błąd podczas pobierania produktów:', error);
}
};
useEffect(() => {
fetchTransactions();
+ fetchProducts();
+ console.log();
}, []);
const handleAddTransaction = async () => {
try {
+ console.log('Nowa transakcja:', newTransaction);
await axios.post('https://localhost:7039/api/Transaction', newTransaction);
+
fetchTransactions();
setIsModalOpen(false);
setNewTransaction({
- id: 1,
+ id: 2,
date: "",
employeeId: "",
transactionProducts: [
{
- id: 0,
+ id: 2,
transactionId: 0,
- productID: "",
+ productID: 0,
+ productName: "",
quantity: ""
}
],
@@ -62,9 +83,104 @@ const Transakcje = () => {
});
} catch (error) {
console.error('Błąd podczas dodawania transakcji:', error);
+ if (error.response && error.response.data) {
+ setError(error.response.data);
+ } else {
+ setError('Wystąpił nieoczekiwany błąd. Spróbuj ponownie później.');
+ }
}
};
+
+ const formatDate = (dateString) => {
+ const options = { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' };
+ const date = new Date(dateString);
+ return date.toLocaleDateString('pl-PL', options).replace(",", "");
+ };
+
+ const handleAddProduct = () => {
+ setNewTransaction({
+ ...newTransaction,
+ transactionProducts: [
+ ...newTransaction.transactionProducts,
+ {
+ id: 2,
+ transactionId: 0,
+ productID: 0,
+ productName: "",
+ quantity: ""
+ }
+ ]
+ });
+ };
+
+ const handleRemoveProduct = (index) => {
+ const updatedTransactionProducts = [...newTransaction.transactionProducts];
+ updatedTransactionProducts.splice(index, 1);
+ setNewTransaction({
+ ...newTransaction,
+ transactionProducts: updatedTransactionProducts
+ });
+ };
+
+ const handleDeleteTransaction = async (transactionId) => {
+ try {
+ await axios.delete(`https://localhost:7039/api/Transaction/${transactionId}`);
+ fetchTransactions();
+ setDeleteTransactionId(null);
+ } catch (error) {
+ console.error('Błąd podczas usuwania transakcji:', error);
+ }
+ };
+ const handleEditTransaction = async (transaction) => {
+ try {
+ if (!editTransaction) {
+ setEditTransaction(transaction);
+ setIsEditModalOpen(true);
+ return;
+ }
+ await axios.put(`https://localhost:7039/api/Transaction/${editTransaction.id}`, editTransaction);
+ fetchTransactions();
+ setIsEditModalOpen(false);
+ setEditTransaction(null);
+ setError(null);
+
+ } catch (error) {
+ console.error('Błąd podczas edycji transakcji:', error);
+ if (error.response && error.response.data) {
+ setError(error.response.data);
+ } else {
+ setError('Wystąpił nieoczekiwany błąd. Spróbuj ponownie później.');
+ }
+ }
+ };
+ const handleProductChange = (index, selectedOption) => {
+ const updatedTransactionProducts = [...newTransaction.transactionProducts];
+ updatedTransactionProducts[index].productID = selectedOption.value;
+ updatedTransactionProducts[index].productName = selectedOption.label;
+ setNewTransaction({
+ ...newTransaction,
+ transactionProducts: updatedTransactionProducts
+ });
+ };
+ const handleEditProductChange = (index, selectedOption) => {
+ const updatedTransactionProducts = [...editTransaction.transactionProducts];
+ updatedTransactionProducts[index].productID = selectedOption.value;
+ updatedTransactionProducts[index].productName = selectedOption.label;
+ setEditTransaction({
+ ...editTransaction,
+ transactionProducts: updatedTransactionProducts
+ });
+ };
+ const openDeleteConfirmation = (transactionId) => {
+ setDeleteTransactionId(transactionId);
+ };
+
+ const closeDeleteConfirmation = () => {
+ setDeleteTransactionId(null);
+ };
+
+
return (
+
diff --git a/firm/src/components/ConfirmationModal.js b/firm/src/components/ConfirmationModal.js
new file mode 100644
index 0000000..58c0d0e
--- /dev/null
+++ b/firm/src/components/ConfirmationModal.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+const ConfirmationModal = ({ message, onCancel, onConfirm }) => {
+ return (
+
@@ -21,6 +23,8 @@ const App = () => {
+
+ );
+};
+
+export default ConfirmationModal;
diff --git a/firm/src/components/Raporty.js b/firm/src/components/Raporty.js
new file mode 100644
index 0000000..4966ac4
--- /dev/null
+++ b/firm/src/components/Raporty.js
@@ -0,0 +1,102 @@
+import React, { useState, useEffect } from 'react';
+import axios from 'axios';
+import koszIcon from "../icons/kosz.png";
+
+const Raporty = () => {
+ const [fromDate, setFromDate] = useState('');
+ const [toDate, setToDate] = useState('');
+ const [reports, setReports] = useState([]);
+
+ const fetchReports = async () => {
+ try {
+ const response = await axios.get('https://localhost:7039/api/Report');
+ setReports(response.data);
+ } catch (error) {
+ console.error('Błąd podczas pobierania raportów:', error);
+ }
+ };
+
+ useEffect(() => {
+ fetchReports();
+ }, []);
+
+ const handleGenerateReport = async () => {
+ try {
+ const response = await axios.post('https://localhost:7039/api/Report', {
+ fromDate,
+ toDate
+ });
+ const newReport = response.data;
+ setReports([...reports, newReport]);
+ } catch (error) {
+ console.error('Błąd podczas generowania raportu:', error);
+ }
+ };
+
+ const handleDeleteReport = async (reportId) => {
+ try {
+ await axios.delete(`https://localhost:7039/api/Report?${reportId}`);
+ setReports(reports.filter(report => report.id !== reportId)); // Update state after deletion
+ } catch (error) {
+ console.error('Błąd podczas usuwania raportu:', error);
+ }
+ };
+
+
+ const formatDate = (dateString) => {
+ const options = { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' };
+ const date = new Date(dateString);
+ return date.toLocaleDateString('pl-PL', options).replace(",", "");
+ };
+
+ return (
+
+
+ Potwierdź usunięcie
+{message}
+
+
+
+
+
+
+ );
+};
+
+export default Raporty;
diff --git a/firm/src/components/Sidebar.js b/firm/src/components/Sidebar.js
index 643682e..2d9f4f3 100644
--- a/firm/src/components/Sidebar.js
+++ b/firm/src/components/Sidebar.js
@@ -4,6 +4,8 @@ import adminIcon from "../icons/panel.png";
import produktIcon from "../icons/produkty.png";
import transakcjeIcon from "../icons/transkacje.png";
import harmonogramIcon from "../icons/harmonogram.png";
+import wydatkiIcon from "../icons/wydatki.png";
+import raportyIcon from "../icons/raport.png";
const Sidebar = () => {
return (
@@ -29,6 +31,16 @@ const Sidebar = () => {
+
+
+ Generowanie raportów
+
+
+
+ setFromDate(e.target.value)} className="mr-5" />
+
+ setToDate(e.target.value)} className="mr-5" />
+
+
+
+
+
+
+
+ Raporty
+| ID | +Data od | +Data do | +Suma dochodów | +Suma wydatków | +Bilans | ++ |
|---|---|---|---|---|---|---|
| {report.id} | +{formatDate(report.fromDate)} | +{formatDate(report.toDate)} | +{report.totalIncome} | +{report.totalExpenses} | +{report.totalBalance} | ++ + | +
@@ -75,6 +191,103 @@ const Transakcje = () => {
Dodaj
+ {error && (
+
+
+ )}
+ {isEditModalOpen && editTransaction && (
+
+
+ Błąd
+{error}
+ +
+
+ )}
+
{isModalOpen && (
+
+ Edytuj transakcję
+ setEditTransaction({ ...editTransaction, date: e.target.value })} + placeholder="Data" + className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg" + /> + setEditTransaction({ ...editTransaction, employeeId: e.target.value })} + placeholder="Nr. Pracownika" + className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg" + /> + {editTransaction.transactionProducts.map((product, index) => ( +
+
+ ))}
+ setEditTransaction({ ...editTransaction, paymentType: e.target.value })}
+ placeholder="Sposób płatności"
+ className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+ setEditTransaction({ ...editTransaction, discount: e.target.value })}
+ placeholder="Rabat"
+ className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+ setEditTransaction({ ...editTransaction, description: e.target.value })}
+ placeholder="Opis"
+ className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+
+
+
@@ -97,18 +310,13 @@ const Transakcje = () => {
/>
{newTransaction.transactionProducts.map((product, index) => (
+ ))}
+
+ setNewTransaction({ ...newTransaction, paymentType: e.target.value })}
+ placeholder="Sposób płatności"
+ className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+ setNewTransaction({ ...newTransaction, discount: e.target.value })}
+ placeholder="Rabat"
+ className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+ setNewTransaction({ ...newTransaction, description: e.target.value })}
+ placeholder="Opis"
+ className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+
+
+
- {
- const newTransactionProducts = [...newTransaction.transactionProducts];
- newTransactionProducts[index].productID = e.target.value;
- setNewTransaction({ ...newTransaction, transactionProducts: newTransactionProducts });
- }}
- placeholder="ID Produktu"
- className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
- />
+
- ))}
- setNewTransaction({ ...newTransaction, paymentType: e.target.value })}
- placeholder="Sposób płatności"
- className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
- />
- setNewTransaction({ ...newTransaction, discount: e.target.value })}
- placeholder="Rabat"
- className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
- />
- setNewTransaction({ ...newTransaction, description: e.target.value })}
- placeholder="Opis"
- className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
- />
-
-
+ placeholder="Ilość" className="block w-full mb-4 px-4 py-2 border border-gray-300 rounded-lg"
+ />
+
+
+
- )}
-
+
+
+
+
+ | ID | +Data | +Produkt | +Ilość | +Kwota | +Sposób płatności | +Nr. Pracownika | ++ | + |
|---|---|---|---|---|---|---|---|---|
| {transaction.id} | +{formatDate(transaction.date)} | +
+ {transaction.transactionProducts.map(product => (
+ {product.product.name}
+ ))}
+ |
+
+ {transaction.transactionProducts.map(product => (
+ {product.quantity}
+ ))}
+ |
+ {transaction.totalPrice} | +{transaction.paymentType} | +{transaction.employeeId} | ++ | + |
- handleDeleteTransaction(deleteTransactionId)}
+ />)}
-
-
-
-
-
- | ID | -Data | -Produkt | -Ilość | -Sposób płatności | -Nr. Pracownika | -
|---|---|---|---|---|---|
| {transaction.id} | -{transaction.date} | -
- {transaction.transactionProducts.map(product => (
- {product.product.name}
- ))}
- |
-
- {transaction.transactionProducts.map(product => (
- {product.quantity}
- ))}
- |
- {transaction.paymentType} | -{transaction.employeeId} | -
-
-
-
+ {deleteTransactionId && (
+
+
+
+
+
+ Zarządzanie wydatkami
+
+
+
+
+
+
+ {showModal && (
+
+
+ Wydatki
+ +| ID | +Data | +Wartość | +Opis | ++ |
|---|---|---|---|---|
| {expense.id} | +{formatDate(expense.date)} | +{expense.value} | +{expense.description} | ++ + | +
+
+
+
+
+
+
+
+ Dodaj nowy wydatek
+
+
+
+
+ setNewExpense({ ...newExpense, date: e.target.value })} className="mt-1 border py-1 px-3 block w-full shadow-sm sm:text-sm rounded-md" />
+
+
+
+
+ setNewExpense({ ...newExpense, value: e.target.value })} className="mt-1 border py-1 px-3 block w-full shadow-sm sm:text-sm rounded-md" />
+
+
+
+
+