Compare commits
26 Commits
v0.14.2-dev.4
...
v0.15.1
| Author | SHA1 | Date | |
|---|---|---|---|
| fa55717f7f | |||
| 4943aff944 | |||
| ee1683abe1 | |||
| 320acb5256 | |||
| 7b2a6d7bc1 | |||
| 027cef257d | |||
| cbacda34ca | |||
| cbc805919a | |||
| 31e8b7ccb4 | |||
| 5d908b6142 | |||
| aa9eb4996a | |||
| 43f963d0d3 | |||
| 6589b8d275 | |||
| 612ce2e6e6 | |||
| 210483d250 | |||
| 943b48ce16 | |||
| 476dfee0ff | |||
| d002c5f9da | |||
| 1dbe5709f5 | |||
| 6b3c35f895 | |||
| d49ec9fd34 | |||
| 8673c0f05c | |||
| 7ab2899e92 | |||
| eba20b7e2e | |||
| 92c86334e9 | |||
| 98b1e39abb |
+13
-1
@@ -13755,4 +13755,16 @@ def upload_csv_batch():
|
||||
"images_processed": processed_count,
|
||||
"images_deduplicated": dedup_count,
|
||||
"images_failed": error_count
|
||||
}), 200
|
||||
}), 200
|
||||
|
||||
@app.route('/test_email')
|
||||
def test_email():
|
||||
|
||||
#Test endpoint to send a sample email.
|
||||
#This is for development purposes only.
|
||||
|
||||
try:
|
||||
send(email="maximiliangruendinger@gmail.com", subject="Test Email from Inventarsystem", note="This is a test email sent from the Inventarsystem application.")
|
||||
return "Test email sent successfully."
|
||||
except Exception as e:
|
||||
return f"Failed to send test email: {str(e)}", 500
|
||||
@@ -9,19 +9,19 @@ import Web.modules.database.settings as cfg
|
||||
|
||||
def _build_smtp_client():
|
||||
smtp = smtplib.SMTP(
|
||||
cfg.EMAIL_SMTP_HOST,
|
||||
cfg.EMAIL_SMTP_PORT,
|
||||
timeout=cfg.EMAIL_TIMEOUT_SECONDS,
|
||||
"mail.invario-software.de",
|
||||
587,
|
||||
timeout=10,
|
||||
)
|
||||
smtp.ehlo()
|
||||
if cfg.EMAIL_USE_TLS:
|
||||
if True:
|
||||
smtp.starttls()
|
||||
smtp.ehlo()
|
||||
if cfg.EMAIL_USERNAME:
|
||||
smtp.login(cfg.EMAIL_USERNAME, cfg.EMAIL_PASSWORD or "")
|
||||
smtp.login("no-reply@invario-software.de", "eSpage,65,{")
|
||||
return smtp
|
||||
|
||||
|
||||
|
||||
def _normalize_recipients(email: list | str) -> list[str]:
|
||||
if isinstance(email, str):
|
||||
email = email.replace(';', ',').split(',')
|
||||
@@ -76,7 +76,7 @@ def _send_message(email: list | str, subject: str, note: str, sender: str, attac
|
||||
|
||||
msg = MIMEMultipart("mixed" if attachment else "alternative")
|
||||
msg["Subject"] = str(subject)
|
||||
from_address = cfg.EMAIL_FROM_ADDRESS or cfg.EMAIL_USERNAME or "no-reply@invario-software.de"
|
||||
from_address = "no-reply@invario-software.de"
|
||||
msg["From"] = f"{sender} <{from_address}>"
|
||||
msg["To"] = str(recipient)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import Web.modules.terminplaner.backend_server as appointment_service
|
||||
import Web.modules.database.settings as cfg
|
||||
import Web.modules.database.termine as termin
|
||||
import Web.modules.database.user as us
|
||||
from Web.modules.emailservice.email import send_pdf
|
||||
from Web.modules.emailservice.email import send, send_pdf
|
||||
from Web.modules.terminplaner.backend_server import _resolve_public_base_url
|
||||
import csv
|
||||
import io
|
||||
|
||||
+41
-36
@@ -1346,11 +1346,13 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if 'username' in session %}
|
||||
<!--
|
||||
{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link quick-link-pill {% if current_path == url_for('tutorial_page') %}nav-active{% endif %}" href="{{ url_for('tutorial_page') }}" data-tutorial-tip="Nutzen Sie das Tutorial, um die Bibliotheksfunktionen kennenzulernen.">Tutorial</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
-->
|
||||
{% endif %}
|
||||
{% if 'username' in session and current_permissions.actions.get('can_insert', False) and current_permissions.pages.get('library_admin', False) %}
|
||||
<li class="nav-item">
|
||||
@@ -1630,6 +1632,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
|
||||
<div id="onboarding-overlay" role="dialog" aria-modal="true" aria-label="Tutorial Vorschlag">
|
||||
<div id="onboarding-modal">
|
||||
<h3>Wollen Sie eine Vorstellung des Produkts?</h3>
|
||||
@@ -1643,6 +1647,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div id="notification-toast" class="notification-toast" role="status" aria-live="polite">
|
||||
<strong id="notification-toast-title">Neue Benachrichtigung</strong>
|
||||
@@ -1662,7 +1667,7 @@
|
||||
<option value="Benachrichtigungen"></option>
|
||||
{% endif %}
|
||||
{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
<option value="Tutorial"></option>
|
||||
<!--<option value="Tutorial"></option>-->
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -1765,10 +1770,10 @@
|
||||
});
|
||||
|
||||
const username = {{ (session['username'] if 'username' in session else '')|tojson }};
|
||||
const isTutorialPage = window.location.pathname === {{ url_for('tutorial_page')|tojson }};
|
||||
//const isTutorialPage = window.location.pathname === {{ url_for('tutorial_page')|tojson }};
|
||||
const isLoginPage = window.location.pathname === {{ url_for('login')|tojson }};
|
||||
const notificationsPagePath = {{ url_for('notifications_view')|tojson }};
|
||||
const onboardingKey = username ? ('inventarsystem_tutorial_prompt_v1_' + username) : null;
|
||||
//const onboardingKey = username ? ('inventarsystem_tutorial_prompt_v1_' + username) : null;
|
||||
const onboardingOverlay = document.getElementById('onboarding-overlay');
|
||||
const notificationButtons = Array.from(document.querySelectorAll('[data-notification-button="true"]'));
|
||||
const notificationToast = document.getElementById('notification-toast');
|
||||
@@ -1789,9 +1794,9 @@
|
||||
{% if current_permissions.pages.get('notifications_view', False) %}
|
||||
{ label: 'Benachrichtigungen', keywords: ['benachrichtigungen', 'nachrichten', 'notifications'], url: {{ url_for('notifications_view')|tojson }} },
|
||||
{% endif %}
|
||||
{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
{ label: 'Tutorial', keywords: ['tutorial', 'hilfe', 'anleitung'], url: {{ url_for('tutorial_page')|tojson }} },
|
||||
{% endif %}
|
||||
//{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
//{ label: 'Tutorial', keywords: ['tutorial', 'hilfe', 'anleitung'], url: {{ url_for('tutorial_page')|tojson }} },
|
||||
//{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{ label: 'Impressum', keywords: ['impressum'], url: {{ url_for('impressum')|tojson }} },
|
||||
@@ -2042,11 +2047,11 @@
|
||||
window.setInterval(pollNotificationStatus, 30000);
|
||||
}
|
||||
|
||||
function showOnboarding(){
|
||||
if (onboardingOverlay) {
|
||||
onboardingOverlay.style.display = 'flex';
|
||||
}
|
||||
}
|
||||
//function showOnboarding(){
|
||||
// if (onboardingOverlay) {
|
||||
// onboardingOverlay.style.display = 'flex';
|
||||
// }
|
||||
//}
|
||||
|
||||
function hideOnboarding(){
|
||||
if (onboardingOverlay) {
|
||||
@@ -2054,19 +2059,19 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (onboardingKey && !isTutorialPage && !isLoginPage) {
|
||||
const decision = localStorage.getItem(onboardingKey);
|
||||
if (!decision || decision === 'later') {
|
||||
showOnboarding();
|
||||
}
|
||||
}
|
||||
//if (onboardingKey && !isTutorialPage && !isLoginPage) {
|
||||
// const decision = localStorage.getItem(onboardingKey);
|
||||
// if (!decision || decision === 'later') {
|
||||
// showOnboarding();
|
||||
// }
|
||||
//}
|
||||
|
||||
document.getElementById('onboarding-start')?.addEventListener('click', function(){
|
||||
if (onboardingKey) {
|
||||
localStorage.setItem(onboardingKey, 'started');
|
||||
}
|
||||
window.location.href = {{ url_for('tutorial_page')|tojson }};
|
||||
});
|
||||
//document.getElementById('onboarding-start')?.addEventListener('click', function(){
|
||||
// if (onboardingKey) {
|
||||
// localStorage.setItem(onboardingKey, 'started');
|
||||
// }
|
||||
// window.location.href = {{ url_for('tutorial_page')|tojson }};
|
||||
//});
|
||||
|
||||
document.getElementById('onboarding-later')?.addEventListener('click', function(){
|
||||
if (onboardingKey) {
|
||||
@@ -2399,21 +2404,21 @@
|
||||
<script>
|
||||
(function () {
|
||||
const username = {{ (session['username'] if 'username' in session else '')|tojson }};
|
||||
const tooltipModeKey = username ? ('inventarsystem_tutorial_tooltips_enabled_' + username) : 'inventarsystem_tutorial_tooltips_enabled';
|
||||
//const tooltipModeKey = username ? ('inventarsystem_tutorial_tooltips_enabled_' + username) : 'inventarsystem_tutorial_tooltips_enabled';
|
||||
const enabled = localStorage.getItem(tooltipModeKey) === '1';
|
||||
|
||||
function applyTooltipMode(active) {
|
||||
document.body.classList.toggle('tutorial-tooltips-active', active);
|
||||
let indicator = document.getElementById('tutorialTooltipIndicator');
|
||||
if (!indicator) {
|
||||
indicator = document.createElement('div');
|
||||
indicator.id = 'tutorialTooltipIndicator';
|
||||
indicator.className = 'tutorial-tooltip-indicator';
|
||||
indicator.textContent = 'Tutorial-Modus aktiv: Tooltips sind eingeschaltet';
|
||||
document.body.appendChild(indicator);
|
||||
}
|
||||
indicator.style.display = active ? 'inline-flex' : 'none';
|
||||
}
|
||||
//function applyTooltipMode(active) {
|
||||
// document.body.classList.toggle('tutorial-tooltips-active', active);
|
||||
// let indicator = document.getElementById('tutorialTooltipIndicator');
|
||||
// if (!indicator) {
|
||||
// indicator = document.createElement('div');
|
||||
// indicator.id = 'tutorialTooltipIndicator';
|
||||
// indicator.className = 'tutorial-tooltip-indicator';
|
||||
// indicator.textContent = 'Tutorial-Modus aktiv: Tooltips sind eingeschaltet';
|
||||
// document.body.appendChild(indicator);
|
||||
// }
|
||||
// indicator.style.display = active ? 'inline-flex' : 'none';
|
||||
//}
|
||||
|
||||
applyTooltipMode(enabled);
|
||||
})();
|
||||
|
||||
@@ -5396,7 +5396,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
max-width: 880px;
|
||||
margin: 4vh auto;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
max-height: 92vh;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
overscroll-behavior: contain;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
border: 1px solid #d8e1eb;
|
||||
border-radius: 16px;
|
||||
background: var(--ui-surface);
|
||||
@@ -5645,6 +5649,8 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
#item-modal .modal-content {
|
||||
width: calc(100vw - 18px);
|
||||
margin: 9px auto;
|
||||
max-height: calc(100dvh - 18px);
|
||||
overflow-y: auto;
|
||||
border-radius: 13px;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user