devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4408 from expsa/revert-4368-eltayar 

Revert "enhance_hijri_date1"
This commit is contained in:
Mohamed Eltayar 2025-08-29 02:05:19 +03:00 committed by GitHub
parent 4f531df431 a13cabfe27
commit 7322ff3450
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
odex25_base/web_hijri_datepicker/static/src/js/web_hijri_date.js
View File

@ -125,35 +125,14 @@ odoo.define('web_hijri_datepicker.datepicker', function (require) {
var value = this.value ? this.datewidget._formatClients(this.value) : '';
var parsed_date = this.value ? this.datewidget._parseDate(this.value) : '';
var hijri_value = parsed_date ? this.datewidget._convertGregorianToHijri(parsed_date) : '';
// Gregorian Date Section
$('<div>', {
class: 'o_date_section'
}).append([
$('<label>', {
class: 'o_date_label o_gregorian_label',
text: 'التاريخ الميلادي'
}),
$('<div>', {
class: 'o_date_value ' + this.$el.attr('class'),
text: value,
})
]).appendTo($div);
// Hijri Date Section
class: this.$el.attr('class'),
text: value,
}).appendTo($div);
$('<div>', {
class: 'o_date_section'
}).append([
$('<label>', {
class: 'o_date_label o_hijri_label',
text: 'التاريخ الهجري'
}),
$('<div>', {
class: 'o_date_value ' + this.$el.attr('class'),
text: hijri_value,
})
]).appendTo($div);
class: this.$el.attr('class'),
text: hijri_value,
}).appendTo($div);
this.datewidget.appendTo('<div>').then(function () {
self._replaceElement($div);
});

58
odex25_base/web_hijri_datepicker/static/src/scss/web_hijri_date.scss
View File

@ -63,62 +63,4 @@
top: 30px;
}
}
// New styles for date labels and sections
.o_date_section {
margin-bottom: 5px;
.o_date_label {
display: block;
font-size: 11px;
font-weight: 600;
color: #6c757d;
margin-bottom: 2px;
&.o_gregorian_label {
color: #007bff;
}
&.o_hijri_label {
color: #28a745;
}
}
.o_date_input_container {
position: relative;
display: flex;
align-items: center;
}
}
}
// Form view specific styles
.o_form_view {
.o_datepicker {
.o_date_section {
.o_date_label {
font-size: 12px;
margin-bottom: 3px;
}
}
}
}
// Read-only mode improvements
.o_field_date.o_readonly_modifier {
.o_date_section {
margin-bottom: 8px;
.o_date_label {
font-size: 11px;
font-weight: 600;
color: #6c757d;
margin-bottom: 2px;
}
.o_date_value {
padding: 2px 0;
font-size: 13px;
}
}
}

39
odex25_base/web_hijri_datepicker/static/src/xml/web_hijri_date.xml
View File

@ -3,32 +3,19 @@
<t t-name="web.datepicker" t-extend="web.datepicker">
<t t-jquery=".o_datepicker" t-operation="replace">
<div class="o_datepicker" aria-atomic="true" t-att-id="datepickerID" data-target-input="nearest">
<!-- Gregorian Date Section -->
<div class="o_date_section">
<label class="o_date_label o_gregorian_label">التاريخ الميلادي</label>
<div class="o_date_input_container">
<input type="text"
class="o_datepicker_input o_input datetimepicker-input"
t-att-name="widget.name"
t-att-placeholder="placeholder"
t-attf-data-target="##{datepickerID}"
autocomplete="off"/>
<span class="o_datepicker_button"/>
</div>
</div>
<!-- Hijri Date Section -->
<div class="o_date_section mt-2">
<label class="o_date_label o_hijri_label">التاريخ الهجري</label>
<div class="o_date_input_container">
<input type="text"
class="o_hijri o_input"
t-att-name="widget.name"
t-att-placeholder="'التاريخ الهجري'"
readonly="readonly"/>
<span class="o_datepicker_button o_hijri_datepicker_button"/>
</div>
</div>
<input type="text"
class="o_datepicker_input o_input datetimepicker-input"
t-att-name="widget.name"
t-att-placeholder="placeholder"
t-attf-data-target="##{datepickerID}"
autocomplete="off"/>
<span class="o_datepicker_button"/>
<span class="o_datepicker_button"/>
<input type="text"
class="o_hijri o_input mt4"
t-att-name="widget.name"
t-att-placeholder="placeholder"/>
<span class="o_datepicker_button o_hijri_datepicker_button"/>
</div>
</t>
</t>