hobbyhimmel/open_workshop
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hübsch
All checks were successful
odoo-restore-open_workshop-install / run-odoo-backup-in-docker (push) Successful in 4m48s
Details

Browse Source
This commit is contained in:
gitea 2025-04-16 20:29:12 +00:00
parent a159b88691
commit ef46a18937
5 changed files with 113 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
static/src/css/pos.css
View File

@ -378,7 +378,6 @@ td {
display: inline-block;
box-sizing: border-box;
-moz-box-sizing: border-box;
height: 48px;
padding-left: 6px;
margin: 2px;
background: #8b8b8b;
@ -437,14 +436,17 @@ td {
margin-left: -4px;
}
.pos .order-button.square{
margin-left:1px;
background: #5c5c5c;
color: rgb(160,160,160);
font-size: 18px;
.pos .order-button.square {
margin-left: 1px;
/* background: #5c5c5c; */
/* color: rgb(160, 160, 160); */
/* font-size: 18px; */
text-align: center;
line-height: 36px;
width: 45%;
/* margin-top: 10px; */
/* margin-bottom: 10px; */
/* padding: 10px; */
}
.pos .order-button:not(.square) > .fa {
font-size: 16px;
@ -1178,7 +1180,7 @@ td {
.screen .screen-content{
/*margin: 0px auto;*/
left: 0px;
max-width: 1024px;
max-width: 1200px;
text-align: left;
height: 100%;
overflow: hidden;
@ -2590,6 +2592,15 @@ td {
margin-bottom: 0.3em;
}
.pos .machine-access-sidebar .subpoints {
margin-left: 0.5em;
list-style-type: none; /* oder none, wenn du keine Punkte willst */
}
.pos .machine-access-sidebar .client-details-vvow_sec_briefing_error{
color: rgb(255, 0, 0);
}
.pos .clientlist-screen .client-details{
padding: 16px;
border-bottom: solid 5px rgb(110,200,155);
@ -2602,7 +2613,7 @@ td {
/* .pos .clientlist-screen .client-details-vvow_briefing{
color: rgb(128, 255, 0);
} */
.pos .clientlist-screen .client-details-vvow_briefing_error{
.pos .client-details-vvow_briefing_error{
color: rgb(255, 0, 0);
}
.pos .clientlist-screen .client-details-vvow_sec_briefing_error{

21
static/src/js/machine_access_sidebar.js
View File

@ -4,12 +4,22 @@
odoo.define('open_workshop.machine_access_sidebar', function (require) {
"use strict";
const DUMMY_PARTNER = {
id: 1,
name: "AAAA Max Mustermann",
security_briefing: false,
security_id: null,
create_date: null,
};
var rpc = require('web.rpc');
var screens = require('point_of_sale.screens');
var chrome = require('point_of_sale.chrome');
var core = require('web.core');
var QWeb = core.qweb;
var MachineAccessSidebar = screens.ScreenWidget.extend({
template: 'MachineAccessSidebar',
@ -32,19 +42,19 @@ odoo.define('open_workshop.machine_access_sidebar', function (require) {
render_access: function() {
var self = this;
var partner = this.partner;
if (!partner) {
this.$('.access-content').html("<p>Kein Kunde ausgewählt.</p>");
return;
}
var partner = this.partner || DUMMY_PARTNER;
rpc.query({
model: 'ows.machine',
method: 'get_access_list_grouped',
args: [partner.id],
}).then(function (result) {
partner.create_date = partner.create_date && partner.create_date.substring(0, 10);
var html = QWeb.render('PartnerMachineAccessList', {
areas: result || [],
partner: partner,
});
self.$('.access-content').html(html);
});
@ -113,7 +123,6 @@ odoo.define('open_workshop.models', function (require) {
var models = require('point_of_sale.models');
var field_utils = require('web.field_utils');
models.load_fields('res.partner', 'create_date');
models.load_fields('res.partner', 'birthday');
models.load_fields('res.partner', 'security_briefing');
models.load_fields('res.partner', 'security_id');

35
static/src/xml/ows_briefing_details.xml
View File

@ -61,43 +61,12 @@
</t>
</div>
<div class='client-detail'>
<span class='label'>Haftungs.</span>
<t t-if='partner.security_briefing'>
<span class='detail client-details-vvow_briefing'>
Ja
</span>
</t>
<t t-if='!partner.security_briefing'>
<span class='detail client-details-vvow_sec_briefing_error'>
Nein, bitte überprüfen!
</span>
</t>
<span class='label'>Id:</span>
<t t-if='partner.security_id'>
<span class='detail client-details-vvow_security_id'>
<t t-esc="partner.security_id"/>
</span>
</t>
<t t-if='!partner.security_id'>
<span class='detail client-details-vvow_security_id__error'>
Kein ID vorhanden
</span>
</t>
</div>
<div class='client-detail'>
<span class='label'>Erstellt am:</span>
<t t-if='partner.create_date'>
<span class='detail client-vvow_birthday'>
<t t-esc='partner.create_date' />
</span>
</t>
<t t-if='!partner.create_date'>
<span class='detail client-vvow_birthday empty'>N/A</span>
</t>
<t t-if='!partner.security_briefing'><span class='detail client-details-vvow_sec_briefing_error'>Haftungsausschluss prüfen!</span></t>
</div>
</div>
</t>
<t t-jquery=".client-details-right" t-operation="replace"/>
</t>
</templates>

1
static/src/xml/ows_briefing_details_edit.xml
View File

@ -59,5 +59,6 @@
</div>
</div>
</t>
<t t-jquery=".client-details-right" t-operation="replace"/>
</t>
</templates>

117
static/src/xml/ows_machine_sidebar.xml
View File

@ -6,48 +6,83 @@
</div>
</div>
</t>
<t t-name="PartnerMachineAccessList">
<div class="client-details-grid">
<div class="client-details-header">
<ul>
<li><span class="client-details-label">Einweisungen</span></li>
</ul>
<t t-name="PartnerMachineAccessList">
<div class="client-details-grid">
<div class='client-details-header'>
<ul><span class='client-details-label'>Einweisungen</span></ul>
<div class='client-details-area' t-att-style="'border: solid 3px #ffffff; margin: 5px;'">
<ul>
<div class='client-detail'>
<span class='detail client-details-vvow_briefing'>✅</span>
<span class='briefinglabel'>Werkstatt</span>
</div>
</ul>
<ul><div class='client-detail'>
<t t-if="!partner.security_briefing"><span class='detail client-details-vvow_briefing_error'>❌</span></t>
<t t-if="partner.security_briefing"><span class='detail client-details-vvow_briefing'>✅</span></t>
<span class='briefinglabel'>Haftungsausschluss</span>
<ul><div class='client-detail'>
<t t-if="!partner.security_briefing"><span class='detail client-details-vvow_sec_briefing_error'>Bitte Prüfen</span></t>
<ul><div class='client-detail'>
<t t-if="partner.security_briefing">
<ul><span class='label'>Id:</span>
<t t-if='partner.security_id'><span class='detail client-details-vvow_security_id'><t t-esc="partner.security_id"/></span></t>
<t t-if='!partner.security_id'><span class='detail client-details-vvow_security_id'>N/A</span></t></ul>
<ul><span class='label'>Erstellt:</span>
<t t-if='partner.create_date'><span class='detail client-details-vvow_security_id'><t t-esc="partner.create_date"/></span></t>
<t t-if='!partner.create_date'><span class='detail client-vvow_birthday'>N/A</span></t></ul></t>
</div></ul>
</div>
</div>
<t t-foreach="areas" t-as="area">
<div class='client-details-area' t-att-style="'border: solid 3px ' + area.color_hex + '; margin: 5px;'">
<ul>
<t t-foreach="area.machines" t-as="machine">
<div class='client-detail'>
<t t-if="!machine.has_access"><span class='detail client-details-vvow_briefing_error'>❌</span></t>
<t t-if="machine.has_access"><span class='detail client-details-vvow_briefing'>✅</span></t>
<span class='briefinglabel'><t t-esc="machine.name" /></span>
</div>
<div class="client-details-area" t-att-style="'border: solid 3px #ffffff; margin: 5px;'">
<ul>
<li class="client-detail">
<span class="detail client-details-vvow_briefing">✅</span>
<span class="briefinglabel">Werkstatt</span>
</li>
<li class="client-detail">
<t t-if="!partner.security_briefing">
<span class="detail client-details-vvow_briefing_error">❌</span>
</t>
</ul>
</div>
</t>
<t t-if="partner.security_briefing">
<span class="detail client-details-vvow_briefing">✅</span>
</t>
<span class="briefinglabel">Haftungsausschluss</span>
</li>
<t t-if="!partner.security_briefing">
<li class="client-detail">
<ul class="subpoints"><span class="detail client-details-vvow_sec_briefing_error">‼️Bitte Prüfen‼️</span></ul>
</li>
</t>
<t t-if="partner.security_briefing">
<ul class="subpoints">
<li class="client-detail">
<span class="label">Id:</span>
<t t-if="partner.security_id">
<span class="detail client-details-vvow_security_id"><t t-esc="partner.security_id"/></span>
</t>
<t t-if="!partner.security_id">
<span class="detail client-details-vvow_security_id">N/A</span>
</t>
</li>
<li class="client-detail">
<span class="label">Erstellt:</span>
<t t-if="partner.create_date">
<span class="detail client-details-vvow_security_id"><t t-esc="partner.create_date"/></span>
</t>
<t t-if="!partner.create_date">
<span class="detail client-vvow_birthday">N/A</span>
</t>
</li>
</ul>
</t>
</ul>
</div>
</div>
</t>
<t t-foreach="areas" t-as="area">
<div class="client-details-area" t-att-style="'border: solid 3px ' + area.color_hex + '; margin: 5px;'">
<ul>
<t t-foreach="area.machines" t-as="machine">
<li class="client-detail">
<t t-if="!machine.has_access">
<span class="detail client-details-vvow_briefing_error">❌</span>
</t>
<t t-if="machine.has_access">
<span class="detail client-details-vvow_briefing">✅</span>
</t>
<span class="briefinglabel"><t t-esc="machine.name"/></span>
</li>
</t>
</ul>
</div>
</t>
</div>
</t>
</templates>