Merge pull request '#77-progress-pitch-books-table' (#79) from #77-progress-pitch-books-table into main
Reviewed-on: #79pull/78/head^2
commit
443a0c5d66
|
|
@ -5,7 +5,6 @@ from dotenv import load_dotenv
|
||||||
from controller import register_routes
|
from controller import register_routes
|
||||||
from model.database import init_db
|
from model.database import init_db
|
||||||
from controller.socketIO import socketio
|
from controller.socketIO import socketio
|
||||||
from controller.kennzahlen import kennzahlen_bp
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
CORS(app)
|
CORS(app)
|
||||||
|
|
@ -22,9 +21,6 @@ init_db(app)
|
||||||
register_routes(app)
|
register_routes(app)
|
||||||
|
|
||||||
|
|
||||||
# Register blueprints
|
|
||||||
app.register_blueprint(kennzahlen_bp)
|
|
||||||
|
|
||||||
@app.route("/health")
|
@app.route("/health")
|
||||||
def health_check():
|
def health_check():
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
from flask import Blueprint, jsonify, request
|
|
||||||
from model.kennzahl import Kennzahl
|
|
||||||
from model.database import db
|
|
||||||
|
|
||||||
kennzahlen_bp = Blueprint('kennzahlen', __name__)
|
|
||||||
|
|
||||||
# Beispieldaten
|
|
||||||
EXAMPLE_DATA = [
|
|
||||||
{"pdf_id": "example", "label": "Fondsname", "value": "Fund Real Estate Prime Europe", "page": 1, "status": "ok"},
|
|
||||||
{"pdf_id": "example", "label": "Fondsmanager", "value": "", "page": 1, "status": "error"},
|
|
||||||
{"pdf_id": "example", "label": "Risikoprofil", "value": "Core/Core+", "page": 10, "status": "warning"},
|
|
||||||
{"pdf_id": "example", "label": "LTV", "value": "30-35 %", "page": 8, "status": "ok"},
|
|
||||||
{"pdf_id": "example", "label": "Ausschüttungsrendite", "value": "4%", "page": 34, "status": "ok"}
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
@kennzahlen_bp.route('/api/kennzahlen/init', methods=['POST'])
|
|
||||||
def init_kennzahlen():
|
|
||||||
try:
|
|
||||||
# Lösche existierende Beispieldaten
|
|
||||||
Kennzahl.query.filter_by(pdf_id='example').delete()
|
|
||||||
|
|
||||||
# Füge Beispieldaten ein
|
|
||||||
for data in EXAMPLE_DATA:
|
|
||||||
kennzahl = Kennzahl(
|
|
||||||
pdf_id=data['pdf_id'],
|
|
||||||
label=data['label'],
|
|
||||||
value=data['value'],
|
|
||||||
page=data['page'],
|
|
||||||
status=data['status']
|
|
||||||
)
|
|
||||||
db.session.add(kennzahl)
|
|
||||||
|
|
||||||
db.session.commit()
|
|
||||||
return jsonify({"message": "Kennzahlen erfolgreich initialisiert"})
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
db.session.rollback()
|
|
||||||
return jsonify({"error": str(e)}), 500
|
|
||||||
|
|
||||||
|
|
||||||
@kennzahlen_bp.route('/api/kennzahlen', methods=['GET'])
|
|
||||||
def get_kennzahlen():
|
|
||||||
pdf_id = request.args.get('pdf_id', 'example') # Default zu 'example' für Beispieldaten
|
|
||||||
kennzahlen = Kennzahl.query.filter_by(pdf_id=pdf_id).all()
|
|
||||||
return jsonify([k.to_dict() for k in kennzahlen])
|
|
||||||
|
|
||||||
|
|
||||||
@kennzahlen_bp.route('/api/kennzahlen/<label>', methods=['PUT'])
|
|
||||||
def update_kennzahl(label):
|
|
||||||
data = request.get_json()
|
|
||||||
pdf_id = request.args.get('pdf_id', 'example') # Default zu 'example' für Beispieldaten
|
|
||||||
|
|
||||||
kennzahl = Kennzahl.query.filter_by(pdf_id=pdf_id, label=label).first()
|
|
||||||
if not kennzahl:
|
|
||||||
return jsonify({'error': 'Kennzahl nicht gefunden'}), 404
|
|
||||||
|
|
||||||
kennzahl.value = data.get('value', kennzahl.value)
|
|
||||||
db.session.commit()
|
|
||||||
|
|
||||||
return jsonify(kennzahl.to_dict())
|
|
||||||
|
|
@ -35,7 +35,7 @@ def create_kpi_setting():
|
||||||
"translation",
|
"translation",
|
||||||
"example",
|
"example",
|
||||||
"position",
|
"position",
|
||||||
"active"
|
"active",
|
||||||
]
|
]
|
||||||
for field in required_fields:
|
for field in required_fields:
|
||||||
if field not in data:
|
if field not in data:
|
||||||
|
|
@ -61,7 +61,7 @@ def create_kpi_setting():
|
||||||
translation=data["translation"],
|
translation=data["translation"],
|
||||||
example=data["example"],
|
example=data["example"],
|
||||||
position=data["position"],
|
position=data["position"],
|
||||||
active=data["active"]
|
active=data["active"],
|
||||||
)
|
)
|
||||||
|
|
||||||
db.session.add(new_kpi_setting)
|
db.session.add(new_kpi_setting)
|
||||||
|
|
@ -136,7 +136,12 @@ def update_kpi_positions():
|
||||||
try:
|
try:
|
||||||
for update_item in data:
|
for update_item in data:
|
||||||
if "id" not in update_item or "position" not in update_item:
|
if "id" not in update_item or "position" not in update_item:
|
||||||
return jsonify({"error": "Each item must have 'id' and 'position' fields"}), 400
|
return (
|
||||||
|
jsonify(
|
||||||
|
{"error": "Each item must have 'id' and 'position' fields"}
|
||||||
|
),
|
||||||
|
400,
|
||||||
|
)
|
||||||
|
|
||||||
kpi_setting = KPISettingModel.query.get_or_404(update_item["id"])
|
kpi_setting = KPISettingModel.query.get_or_404(update_item["id"])
|
||||||
kpi_setting.position = update_item["position"]
|
kpi_setting.position = update_item["position"]
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,6 @@ def progress():
|
||||||
):
|
):
|
||||||
return jsonify({"error": "Invalid progress value"}), 400
|
return jsonify({"error": "Invalid progress value"}), 400
|
||||||
|
|
||||||
socketio.emit("progress", {"id": data["id"], "progress": data["progress"]})
|
socketio.emit("progress", {"id": int(data["id"]), "progress": data["progress"]})
|
||||||
# Process the data and return a response
|
# Process the data and return a response
|
||||||
return jsonify({"message": "Progress updated"})
|
return jsonify({"message": "Progress updated"})
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,5 @@ def init_db(app):
|
||||||
with app.app_context():
|
with app.app_context():
|
||||||
db.create_all()
|
db.create_all()
|
||||||
from model.seed_data import seed_default_kpi_settings
|
from model.seed_data import seed_default_kpi_settings
|
||||||
|
|
||||||
seed_default_kpi_settings()
|
seed_default_kpi_settings()
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
from .database import db
|
|
||||||
|
|
||||||
|
|
||||||
class Kennzahl(db.Model):
|
|
||||||
__tablename__ = 'kennzahlen'
|
|
||||||
|
|
||||||
id = db.Column(db.Integer, primary_key=True)
|
|
||||||
pdf_id = db.Column(db.String(100), nullable=False) # ID des PDFs
|
|
||||||
label = db.Column(db.String(100), nullable=False)
|
|
||||||
value = db.Column(db.String(100))
|
|
||||||
page = db.Column(db.Integer)
|
|
||||||
status = db.Column(db.String(20))
|
|
||||||
|
|
||||||
# Zusammengesetzter Unique-Constraint für pdf_id und label
|
|
||||||
__table_args__ = (
|
|
||||||
db.UniqueConstraint('pdf_id', 'label', name='unique_pdf_kennzahl'),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_dict(self):
|
|
||||||
return {
|
|
||||||
'pdf_id': self.pdf_id,
|
|
||||||
'label': self.label,
|
|
||||||
'value': self.value,
|
|
||||||
'page': self.page,
|
|
||||||
'status': self.status
|
|
||||||
}
|
|
||||||
|
|
@ -38,10 +38,12 @@ class KPISettingModel(db.Model):
|
||||||
"translation": self.translation,
|
"translation": self.translation,
|
||||||
"example": self.example,
|
"example": self.example,
|
||||||
"position": self.position,
|
"position": self.position,
|
||||||
"active": self.active
|
"active": self.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self, name, description, mandatory, type, translation, example, position, active):
|
def __init__(
|
||||||
|
self, name, description, mandatory, type, translation, example, position, active
|
||||||
|
):
|
||||||
self.name = name
|
self.name = name
|
||||||
self.description = description
|
self.description = description
|
||||||
self.mandatory = mandatory
|
self.mandatory = mandatory
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
from model.database import db
|
from model.database import db
|
||||||
from sqlalchemy.orm import Mapped, mapped_column
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
from sqlalchemy import LargeBinary
|
from sqlalchemy import LargeBinary
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
class PitchBookModel(db.Model):
|
class PitchBookModel(db.Model):
|
||||||
|
|
@ -8,9 +9,15 @@ class PitchBookModel(db.Model):
|
||||||
filename: Mapped[str] = mapped_column()
|
filename: Mapped[str] = mapped_column()
|
||||||
file: Mapped[bytes] = mapped_column(LargeBinary)
|
file: Mapped[bytes] = mapped_column(LargeBinary)
|
||||||
kpi: Mapped[str | None]
|
kpi: Mapped[str | None]
|
||||||
|
created_at: Mapped[datetime] = mapped_column(default=datetime.utcnow)
|
||||||
|
|
||||||
def to_dict(self):
|
def to_dict(self):
|
||||||
return {"id": self.id, "filename": self.filename, "kpi": self.kpi}
|
return {
|
||||||
|
"id": self.id,
|
||||||
|
"filename": self.filename,
|
||||||
|
"kpi": self.kpi,
|
||||||
|
"created_at": self.created_at.isoformat() if self.created_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
def __init__(self, filename, file):
|
def __init__(self, filename, file):
|
||||||
self.filename = filename
|
self.filename = filename
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
from model.database import db
|
from model.database import db
|
||||||
from model.kpi_setting_model import KPISettingModel, KPISettingType
|
from model.kpi_setting_model import KPISettingModel, KPISettingType
|
||||||
|
|
||||||
|
|
||||||
def seed_default_kpi_settings():
|
def seed_default_kpi_settings():
|
||||||
if KPISettingModel.query.first() is not None:
|
if KPISettingModel.query.first() is not None:
|
||||||
print("KPI Settings bereits vorhanden, Seeding übersprungen")
|
print("KPI Settings bereits vorhanden, Seeding übersprungen")
|
||||||
|
|
@ -15,7 +16,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Fund Name",
|
"translation": "Fund Name",
|
||||||
"example": "Alpha Real Estate Fund I",
|
"example": "Alpha Real Estate Fund I",
|
||||||
"position": 1,
|
"position": 1,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Fondsmanager",
|
"name": "Fondsmanager",
|
||||||
|
|
@ -25,7 +26,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Fund Manager",
|
"translation": "Fund Manager",
|
||||||
"example": "Max Mustermann",
|
"example": "Max Mustermann",
|
||||||
"position": 2,
|
"position": 2,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "AIFM",
|
"name": "AIFM",
|
||||||
|
|
@ -35,7 +36,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "AIFM",
|
"translation": "AIFM",
|
||||||
"example": "Alpha Investment Management GmbH",
|
"example": "Alpha Investment Management GmbH",
|
||||||
"position": 3,
|
"position": 3,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Datum",
|
"name": "Datum",
|
||||||
|
|
@ -45,7 +46,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Date",
|
"translation": "Date",
|
||||||
"example": "05.05.2025",
|
"example": "05.05.2025",
|
||||||
"position": 4,
|
"position": 4,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Risikoprofil",
|
"name": "Risikoprofil",
|
||||||
|
|
@ -55,7 +56,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Risk Profile",
|
"translation": "Risk Profile",
|
||||||
"example": "Core/Core++",
|
"example": "Core/Core++",
|
||||||
"position": 5,
|
"position": 5,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Artikel",
|
"name": "Artikel",
|
||||||
|
|
@ -65,7 +66,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Article",
|
"translation": "Article",
|
||||||
"example": "Artikel 8",
|
"example": "Artikel 8",
|
||||||
"position": 6,
|
"position": 6,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Zielrendite",
|
"name": "Zielrendite",
|
||||||
|
|
@ -75,7 +76,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Target Return",
|
"translation": "Target Return",
|
||||||
"example": "6.5",
|
"example": "6.5",
|
||||||
"position": 7,
|
"position": 7,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Rendite",
|
"name": "Rendite",
|
||||||
|
|
@ -85,7 +86,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Return",
|
"translation": "Return",
|
||||||
"example": "5.8",
|
"example": "5.8",
|
||||||
"position": 8,
|
"position": 8,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Zielausschüttung",
|
"name": "Zielausschüttung",
|
||||||
|
|
@ -95,7 +96,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Target Distribution",
|
"translation": "Target Distribution",
|
||||||
"example": "4.0",
|
"example": "4.0",
|
||||||
"position": 9,
|
"position": 9,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Ausschüttung",
|
"name": "Ausschüttung",
|
||||||
|
|
@ -105,7 +106,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Distribution",
|
"translation": "Distribution",
|
||||||
"example": "3.8",
|
"example": "3.8",
|
||||||
"position": 10,
|
"position": 10,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Laufzeit",
|
"name": "Laufzeit",
|
||||||
|
|
@ -115,7 +116,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Duration",
|
"translation": "Duration",
|
||||||
"example": "7 Jahre, 10, Evergreen",
|
"example": "7 Jahre, 10, Evergreen",
|
||||||
"position": 11,
|
"position": 11,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "LTV",
|
"name": "LTV",
|
||||||
|
|
@ -125,7 +126,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "LTV",
|
"translation": "LTV",
|
||||||
"example": "65.0",
|
"example": "65.0",
|
||||||
"position": 12,
|
"position": 12,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Managementgebühren",
|
"name": "Managementgebühren",
|
||||||
|
|
@ -135,7 +136,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Management Fees",
|
"translation": "Management Fees",
|
||||||
"example": "1.5",
|
"example": "1.5",
|
||||||
"position": 13,
|
"position": 13,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Sektorenallokation",
|
"name": "Sektorenallokation",
|
||||||
|
|
@ -145,7 +146,7 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Sector Allocation",
|
"translation": "Sector Allocation",
|
||||||
"example": "Büro, Wohnen, Logistik, Studentenwohnen",
|
"example": "Büro, Wohnen, Logistik, Studentenwohnen",
|
||||||
"position": 14,
|
"position": 14,
|
||||||
"active": True
|
"active": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Länderallokation",
|
"name": "Länderallokation",
|
||||||
|
|
@ -155,8 +156,8 @@ def seed_default_kpi_settings():
|
||||||
"translation": "Country Allocation",
|
"translation": "Country Allocation",
|
||||||
"example": "Deutschland,Frankreich, Österreich, Schweiz",
|
"example": "Deutschland,Frankreich, Österreich, Schweiz",
|
||||||
"position": 15,
|
"position": 15,
|
||||||
"active": True
|
"active": True,
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
print("Füge Standard KPI Settings hinzu...")
|
print("Füge Standard KPI Settings hinzu...")
|
||||||
|
|
@ -170,14 +171,16 @@ def seed_default_kpi_settings():
|
||||||
translation=kpi_data["translation"],
|
translation=kpi_data["translation"],
|
||||||
example=kpi_data["example"],
|
example=kpi_data["example"],
|
||||||
position=kpi_data["position"],
|
position=kpi_data["position"],
|
||||||
active=kpi_data["active"]
|
active=kpi_data["active"],
|
||||||
)
|
)
|
||||||
|
|
||||||
db.session.add(kpi_setting)
|
db.session.add(kpi_setting)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
print(f"Erfolgreich {len(default_kpi_settings)} Standard KPI Settings hinzugefügt")
|
print(
|
||||||
|
f"Erfolgreich {len(default_kpi_settings)} Standard KPI Settings hinzugefügt"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
print(f"Fehler beim Hinzufügen der Standard KPI Settings: {e}")
|
print(f"Fehler beim Hinzufügen der Standard KPI Settings: {e}")
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ export default function KennzahlenTable({
|
||||||
data,
|
data,
|
||||||
pdfId,
|
pdfId,
|
||||||
settings,
|
settings,
|
||||||
from
|
from,
|
||||||
}: KennzahlenTableProps) {
|
}: KennzahlenTableProps) {
|
||||||
const [editingIndex, setEditingIndex] = useState<string>("");
|
const [editingIndex, setEditingIndex] = useState<string>("");
|
||||||
const [editValue, setEditValue] = useState("");
|
const [editValue, setEditValue] = useState("");
|
||||||
|
|
@ -229,12 +229,17 @@ export default function KennzahlenTable({
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
) : (
|
) : (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title={hasNoValue ?
|
title={
|
||||||
|
hasNoValue ? (
|
||||||
<>
|
<>
|
||||||
<b>Problem</b>
|
<b>Problem</b>
|
||||||
<br />
|
<br />
|
||||||
Es wurden keine Kennzahlen gefunden. Bitte ergänzen!
|
Es wurden keine Kennzahlen gefunden. Bitte
|
||||||
</> : ""
|
ergänzen!
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
""
|
||||||
|
)
|
||||||
}
|
}
|
||||||
placement="bottom"
|
placement="bottom"
|
||||||
arrow
|
arrow
|
||||||
|
|
@ -261,7 +266,10 @@ export default function KennzahlenTable({
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{hasNoValue && (
|
{hasNoValue && (
|
||||||
<ErrorOutlineIcon fontSize="small" color="error" />
|
<ErrorOutlineIcon
|
||||||
|
fontSize="small"
|
||||||
|
color="error"
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
{editingIndex === row.setting.name ? (
|
{editingIndex === row.setting.name ? (
|
||||||
<TextField
|
<TextField
|
||||||
|
|
@ -306,7 +314,10 @@ export default function KennzahlenTable({
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
const extractedValue = row.extractedValues.at(0);
|
const extractedValue = row.extractedValues.at(0);
|
||||||
if (extractedValue?.page && extractedValue.page > 0) {
|
if (extractedValue?.page && extractedValue.page > 0) {
|
||||||
onPageClick?.(Number(extractedValue.page), extractedValue.entity || "");
|
onPageClick?.(
|
||||||
|
Number(extractedValue.page),
|
||||||
|
extractedValue.entity || "",
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
sx={{ cursor: "pointer" }}
|
sx={{ cursor: "pointer" }}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,34 @@
|
||||||
import { Box, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Typography, CircularProgress, Chip } from "@mui/material";
|
import CheckCircleIcon from "@mui/icons-material/CheckCircle";
|
||||||
import { useSuspenseQuery } from "@tanstack/react-query";
|
import HourglassEmptyIcon from "@mui/icons-material/HourglassEmpty";
|
||||||
|
import PictureAsPdfIcon from "@mui/icons-material/PictureAsPdf";
|
||||||
|
import {
|
||||||
|
Box,
|
||||||
|
Chip,
|
||||||
|
CircularProgress,
|
||||||
|
LinearProgress,
|
||||||
|
Paper,
|
||||||
|
Table,
|
||||||
|
TableBody,
|
||||||
|
TableCell,
|
||||||
|
TableContainer,
|
||||||
|
TableHead,
|
||||||
|
TableRow,
|
||||||
|
Typography,
|
||||||
|
} from "@mui/material";
|
||||||
|
import { useQueryClient, useSuspenseQuery } from "@tanstack/react-query";
|
||||||
import { useNavigate } from "@tanstack/react-router";
|
import { useNavigate } from "@tanstack/react-router";
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
import { socket } from "../socket";
|
||||||
|
import { fetchPitchBooksById } from "../util/api";
|
||||||
import { pitchBooksQueryOptions } from "../util/query";
|
import { pitchBooksQueryOptions } from "../util/query";
|
||||||
import PictureAsPdfIcon from '@mui/icons-material/PictureAsPdf';
|
|
||||||
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
|
|
||||||
import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
|
|
||||||
|
|
||||||
interface PitchBook {
|
interface PitchBook {
|
||||||
id: number;
|
id: number;
|
||||||
filename: string;
|
filename: string;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
kpi?: string | {
|
kpi?:
|
||||||
|
| string
|
||||||
|
| {
|
||||||
[key: string]: {
|
[key: string]: {
|
||||||
label: string;
|
label: string;
|
||||||
entity: string;
|
entity: string;
|
||||||
|
|
@ -19,54 +37,160 @@ interface PitchBook {
|
||||||
source: string;
|
source: string;
|
||||||
}[];
|
}[];
|
||||||
};
|
};
|
||||||
status?: 'processing' | 'completed';
|
status?: "processing" | "completed";
|
||||||
}
|
}
|
||||||
|
|
||||||
export function PitchBooksTable() {
|
export function PitchBooksTable() {
|
||||||
|
const [loadingPitchBooks, setLoadingPitchBooks] = useState<
|
||||||
|
{
|
||||||
|
id: number;
|
||||||
|
progress: number;
|
||||||
|
filename?: string;
|
||||||
|
buffer: number;
|
||||||
|
intervalId?: number;
|
||||||
|
}[]
|
||||||
|
>([]);
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { data: pitchBooks, isLoading } = useSuspenseQuery(pitchBooksQueryOptions());
|
const { data: pitchBooks, isLoading } = useSuspenseQuery(
|
||||||
|
pitchBooksQueryOptions(),
|
||||||
|
);
|
||||||
|
|
||||||
const handleRowClick = (pitchBookId: number) => {
|
const handleRowClick = (pitchBookId: number) => {
|
||||||
navigate({
|
navigate({
|
||||||
to: "/extractedResult/$pitchBook",
|
to: "/extractedResult/$pitchBook",
|
||||||
params: { pitchBook: pitchBookId.toString() },
|
params: { pitchBook: pitchBookId.toString() },
|
||||||
search: { from: "overview" }
|
search: { from: "overview" },
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onConnection = useCallback(() => {
|
||||||
|
console.log("connected");
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
const onProgress = useCallback(
|
||||||
|
(progress: { id: number; progress: number }) => {
|
||||||
|
if (progress.progress === 100) {
|
||||||
|
setLoadingPitchBooks((prev) => {
|
||||||
|
const intervalId = prev.find(
|
||||||
|
(item) => item.id === progress.id,
|
||||||
|
)?.intervalId;
|
||||||
|
console.log(intervalId, prev);
|
||||||
|
intervalId && clearInterval(intervalId);
|
||||||
|
|
||||||
|
return [...prev.filter((item) => item.id !== progress.id)];
|
||||||
|
});
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: pitchBooksQueryOptions().queryKey,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
setLoadingPitchBooks((prev) => {
|
||||||
|
const oldItem = prev.find((item) => item.id === progress.id);
|
||||||
|
let intervalId = oldItem?.intervalId;
|
||||||
|
if (!oldItem) {
|
||||||
|
intervalId = setInterval(() => {
|
||||||
|
setLoadingPitchBooks((prev) => {
|
||||||
|
const oldItem = prev.find((item) => item.id === progress.id);
|
||||||
|
if (!oldItem) return prev;
|
||||||
|
|
||||||
|
return [
|
||||||
|
...prev.filter((e) => e.id !== progress.id),
|
||||||
|
{
|
||||||
|
id: progress.id,
|
||||||
|
progress: oldItem?.progress ?? progress.progress,
|
||||||
|
filename: oldItem?.filename,
|
||||||
|
buffer: oldItem ? oldItem.buffer + 0.5 : 0,
|
||||||
|
intervalId: oldItem.intervalId,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
});
|
||||||
|
}, 400);
|
||||||
|
|
||||||
|
fetchPitchBooksById(progress.id)
|
||||||
|
.then((res) => {
|
||||||
|
setLoadingPitchBooks((prev) => [
|
||||||
|
...prev.filter((item) => item.id !== progress.id),
|
||||||
|
{
|
||||||
|
id: progress.id,
|
||||||
|
progress: progress.progress,
|
||||||
|
filename: res.filename,
|
||||||
|
buffer: 0,
|
||||||
|
intervalId,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
...prev.filter((item) => item.id !== progress.id),
|
||||||
|
{
|
||||||
|
id: progress.id,
|
||||||
|
progress: progress.progress,
|
||||||
|
filename: oldItem?.filename,
|
||||||
|
buffer: 0,
|
||||||
|
intervalId,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[queryClient],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
socket.on("connect", onConnection);
|
||||||
|
socket.on("progress", onProgress);
|
||||||
|
return () => {
|
||||||
|
socket.off("connect", onConnection);
|
||||||
|
socket.off("progress", onProgress);
|
||||||
|
};
|
||||||
|
}, [onConnection, onProgress]);
|
||||||
|
|
||||||
const getKPIValue = (pitchBook: PitchBook, fieldName: string): string => {
|
const getKPIValue = (pitchBook: PitchBook, fieldName: string): string => {
|
||||||
if (!pitchBook.kpi || typeof pitchBook.kpi === 'string') {
|
if (!pitchBook.kpi || typeof pitchBook.kpi === "string") {
|
||||||
try {
|
try {
|
||||||
const parsedKPI = JSON.parse(pitchBook.kpi as string);
|
const parsedKPI = JSON.parse(pitchBook.kpi as string);
|
||||||
// Convert array to object format if needed
|
// Convert array to object format if needed
|
||||||
const kpiObj = Array.isArray(parsedKPI) ?
|
const kpiObj = Array.isArray(parsedKPI)
|
||||||
parsedKPI.reduce((acc: any, item: any) => {
|
? parsedKPI.reduce((acc, item) => {
|
||||||
if (!acc[item.label]) acc[item.label] = [];
|
if (!acc[item.label]) acc[item.label] = [];
|
||||||
acc[item.label].push(item);
|
acc[item.label].push(item);
|
||||||
return acc;
|
return acc;
|
||||||
}, {}) : parsedKPI;
|
}, {})
|
||||||
|
: parsedKPI;
|
||||||
|
|
||||||
return kpiObj[fieldName]?.[0]?.entity || 'N/A';
|
return kpiObj[fieldName]?.[0]?.entity || "N/A";
|
||||||
} catch {
|
} catch {
|
||||||
return 'N/A';
|
return "N/A";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (pitchBook.kpi as any)[fieldName]?.[0]?.entity || 'N/A';
|
return pitchBook.kpi[fieldName]?.[0]?.entity || "N/A";
|
||||||
};
|
};
|
||||||
|
|
||||||
const getStatus = (pitchBook: PitchBook) => {
|
const getStatus = (pitchBook: PitchBook) => {
|
||||||
if (pitchBook.kpi &&
|
if (
|
||||||
((typeof pitchBook.kpi === 'string' && pitchBook.kpi !== '{}') ||
|
pitchBook.kpi &&
|
||||||
(typeof pitchBook.kpi === 'object' && Object.keys(pitchBook.kpi).length > 0))) {
|
((typeof pitchBook.kpi === "string" && pitchBook.kpi !== "{}") ||
|
||||||
return 'completed';
|
(typeof pitchBook.kpi === "object" &&
|
||||||
|
Object.keys(pitchBook.kpi).length > 0))
|
||||||
|
) {
|
||||||
|
return "completed";
|
||||||
}
|
}
|
||||||
return 'processing';
|
return "processing";
|
||||||
};
|
};
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
<Box display="flex" justifyContent="center" alignItems="center" height="400px">
|
<Box
|
||||||
|
display="flex"
|
||||||
|
justifyContent="center"
|
||||||
|
alignItems="center"
|
||||||
|
height="400px"
|
||||||
|
>
|
||||||
<CircularProgress sx={{ color: "#383838" }} />
|
<CircularProgress sx={{ color: "#383838" }} />
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|
@ -84,23 +208,37 @@ export function PitchBooksTable() {
|
||||||
<Table>
|
<Table>
|
||||||
<TableHead>
|
<TableHead>
|
||||||
<TableRow sx={{ backgroundColor: "#f5f5f5" }}>
|
<TableRow sx={{ backgroundColor: "#f5f5f5" }}>
|
||||||
<TableCell sx={{ width: "60px" }}></TableCell>
|
<TableCell sx={{ width: "60px" }} />
|
||||||
<TableCell sx={{ fontWeight: "bold" }}>Fondsname</TableCell>
|
<TableCell sx={{ fontWeight: "bold" }}>Fondsname</TableCell>
|
||||||
<TableCell sx={{ fontWeight: "bold" }}>Fondsmanager</TableCell>
|
<TableCell sx={{ fontWeight: "bold" }}>Fondsmanager</TableCell>
|
||||||
<TableCell sx={{ fontWeight: "bold" }}>Dateiname</TableCell>
|
<TableCell sx={{ fontWeight: "bold" }}>Dateiname</TableCell>
|
||||||
<TableCell sx={{ fontWeight: "bold", width: "120px" }}>Status</TableCell>
|
<TableCell sx={{ fontWeight: "bold", width: "120px" }}>
|
||||||
|
Status
|
||||||
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHead>
|
</TableHead>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{pitchBooks.map((pitchBook: PitchBook) => {
|
{pitchBooks
|
||||||
|
.filter(
|
||||||
|
(pitchbook: PitchBook) =>
|
||||||
|
!loadingPitchBooks.some((e) => e.id === pitchbook.id),
|
||||||
|
)
|
||||||
|
.sort(
|
||||||
|
(a: PitchBook, b: PitchBook) =>
|
||||||
|
new Date(a.created_at).getTime() -
|
||||||
|
new Date(b.created_at).getTime(),
|
||||||
|
)
|
||||||
|
.map((pitchBook: PitchBook) => {
|
||||||
const status = getStatus(pitchBook);
|
const status = getStatus(pitchBook);
|
||||||
const fundName = getKPIValue(pitchBook, 'FONDSNAME') ||
|
const fundName =
|
||||||
getKPIValue(pitchBook, 'FUND_NAME') ||
|
getKPIValue(pitchBook, "FONDSNAME") ||
|
||||||
getKPIValue(pitchBook, 'NAME');
|
getKPIValue(pitchBook, "FUND_NAME") ||
|
||||||
|
getKPIValue(pitchBook, "NAME");
|
||||||
|
|
||||||
const manager = getKPIValue(pitchBook, 'FONDSMANAGER') ||
|
const manager =
|
||||||
getKPIValue(pitchBook, 'MANAGER') ||
|
getKPIValue(pitchBook, "FONDSMANAGER") ||
|
||||||
getKPIValue(pitchBook, 'PORTFOLIO_MANAGER');
|
getKPIValue(pitchBook, "MANAGER") ||
|
||||||
|
getKPIValue(pitchBook, "PORTFOLIO_MANAGER");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TableRow
|
<TableRow
|
||||||
|
|
@ -126,7 +264,10 @@ export function PitchBooksTable() {
|
||||||
border: "1px solid #e0e0e0",
|
border: "1px solid #e0e0e0",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<PictureAsPdfIcon fontSize="small" sx={{ color: "#666" }} />
|
<PictureAsPdfIcon
|
||||||
|
fontSize="small"
|
||||||
|
sx={{ color: "#666" }}
|
||||||
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
|
|
@ -136,12 +277,16 @@ export function PitchBooksTable() {
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>{manager}</TableCell>
|
<TableCell>{manager}</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
<Typography variant="body2" color="text.secondary" fontSize="0.875rem">
|
<Typography
|
||||||
|
variant="body2"
|
||||||
|
color="text.secondary"
|
||||||
|
fontSize="0.875rem"
|
||||||
|
>
|
||||||
{pitchBook.filename}
|
{pitchBook.filename}
|
||||||
</Typography>
|
</Typography>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
{status === 'completed' ? (
|
{status === "completed" ? (
|
||||||
<Chip
|
<Chip
|
||||||
icon={<CheckCircleIcon />}
|
icon={<CheckCircleIcon />}
|
||||||
label="Abgeschlossen"
|
label="Abgeschlossen"
|
||||||
|
|
@ -172,6 +317,63 @@ export function PitchBooksTable() {
|
||||||
</TableRow>
|
</TableRow>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
{loadingPitchBooks
|
||||||
|
.sort((a, b) => a.id - b.id)
|
||||||
|
.map((pitchBook) => (
|
||||||
|
<TableRow key={pitchBook.id}>
|
||||||
|
<TableCell>
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
width: 40,
|
||||||
|
height: 50,
|
||||||
|
backgroundColor: "#f0f0f0",
|
||||||
|
borderRadius: 1,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
border: "1px solid #e0e0e0",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<PictureAsPdfIcon fontSize="small" sx={{ color: "#666" }} />
|
||||||
|
</Box>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell colSpan={2}>
|
||||||
|
<LinearProgress
|
||||||
|
variant="buffer"
|
||||||
|
value={pitchBook.progress}
|
||||||
|
valueBuffer={
|
||||||
|
pitchBook.buffer
|
||||||
|
? pitchBook.progress + pitchBook.buffer
|
||||||
|
: pitchBook.progress
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
{" "}
|
||||||
|
<Typography
|
||||||
|
variant="body2"
|
||||||
|
color="text.secondary"
|
||||||
|
fontSize="0.875rem"
|
||||||
|
>
|
||||||
|
{pitchBook.filename}
|
||||||
|
</Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Chip
|
||||||
|
icon={<HourglassEmptyIcon />}
|
||||||
|
label="In Bearbeitung"
|
||||||
|
size="small"
|
||||||
|
sx={{
|
||||||
|
backgroundColor: "#fff3e0",
|
||||||
|
color: "#e65100",
|
||||||
|
"& .MuiChip-icon": {
|
||||||
|
color: "#e65100",
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
))}
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
{pitchBooks.length === 0 && (
|
{pitchBooks.length === 0 && (
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
import SettingsIcon from "@mui/icons-material/Settings";
|
import SettingsIcon from "@mui/icons-material/Settings";
|
||||||
import { Backdrop, Box, Button, IconButton, Paper } from "@mui/material";
|
import { Backdrop, Box, Button, IconButton, Paper } from "@mui/material";
|
||||||
import { useNavigate } from "@tanstack/react-router";
|
import { useNavigate, useRouter } from "@tanstack/react-router";
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useCallback, useEffect, useState } from "react";
|
||||||
import FileUpload from "react-material-file-upload";
|
import FileUpload from "react-material-file-upload";
|
||||||
import { socket } from "../socket";
|
import { socket } from "../socket";
|
||||||
import { CircularProgressWithLabel } from "./CircularProgressWithLabel";
|
|
||||||
import { API_HOST } from "../util/api";
|
import { API_HOST } from "../util/api";
|
||||||
|
import { CircularProgressWithLabel } from "./CircularProgressWithLabel";
|
||||||
|
|
||||||
export default function UploadPage() {
|
export default function UploadPage() {
|
||||||
const [files, setFiles] = useState<File[]>([]);
|
const [files, setFiles] = useState<File[]>([]);
|
||||||
|
|
@ -13,6 +13,7 @@ export default function UploadPage() {
|
||||||
const [loadingState, setLoadingState] = useState<number | null>(null);
|
const [loadingState, setLoadingState] = useState<number | null>(null);
|
||||||
const fileTypes = ["pdf"];
|
const fileTypes = ["pdf"];
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
const uploadFile = useCallback(async () => {
|
const uploadFile = useCallback(async () => {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
|
|
@ -178,6 +179,7 @@ export default function UploadPage() {
|
||||||
backgroundColor: "#383838",
|
backgroundColor: "#383838",
|
||||||
"&:hover": { backgroundColor: "#2e2e2e" },
|
"&:hover": { backgroundColor: "#2e2e2e" },
|
||||||
}}
|
}}
|
||||||
|
onMouseEnter={() => router.preloadRoute({ to: "/pitchbooks" })}
|
||||||
onClick={() => navigate({ to: "/pitchbooks" })}
|
onClick={() => navigate({ to: "/pitchbooks" })}
|
||||||
>
|
>
|
||||||
Alle Pitch Books anzeigen
|
Alle Pitch Books anzeigen
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import type { Kennzahl } from "@/types/kpi";
|
import type { Kennzahl } from "@/types/kpi";
|
||||||
|
|
||||||
const API_HOST = import.meta.env.VITE_API_HOST || 'http://localhost:5050';
|
const API_HOST = import.meta.env.VITE_API_HOST || "http://localhost:5050";
|
||||||
|
|
||||||
export { API_HOST };
|
export { API_HOST };
|
||||||
|
|
||||||
|
|
@ -15,9 +15,7 @@ export const fetchKPI = async (
|
||||||
source: string;
|
source: string;
|
||||||
}[];
|
}[];
|
||||||
}> => {
|
}> => {
|
||||||
const response = await fetch(
|
const response = await fetch(`${API_HOST}/api/pitch_book/${pitchBookId}`);
|
||||||
`${API_HOST}/api/pitch_book/${pitchBookId}`,
|
|
||||||
);
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
return data.kpi ? getKPI(data.kpi) : {};
|
return data.kpi ? getKPI(data.kpi) : {};
|
||||||
|
|
@ -46,13 +44,10 @@ export const fetchPutKPI = async (
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("kpi", JSON.stringify(flattenKPIArray(kpi)));
|
formData.append("kpi", JSON.stringify(flattenKPIArray(kpi)));
|
||||||
|
|
||||||
const response = await fetch(
|
const response = await fetch(`${API_HOST}/api/pitch_book/${pitchBookId}`, {
|
||||||
`${API_HOST}/api/pitch_book/${pitchBookId}`,
|
|
||||||
{
|
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
body: formData,
|
body: formData,
|
||||||
},
|
});
|
||||||
);
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`HTTP error! status: ${response.status}`);
|
throw new Error(`HTTP error! status: ${response.status}`);
|
||||||
}
|
}
|
||||||
|
|
@ -119,3 +114,11 @@ export async function fetchPitchBooks() {
|
||||||
}
|
}
|
||||||
return response.json();
|
return response.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function fetchPitchBooksById(id: number) {
|
||||||
|
const response = await fetch(`${API_HOST}/api/pitch_book/${id}`);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Failed to fetch pitch books");
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue