Skip to content

Commit 873dd6b

Browse files
committed
Sprint 02/26
1 parent 2ed1177 commit 873dd6b

File tree

2 files changed

+100
-167
lines changed

2 files changed

+100
-167
lines changed

css/00-central-package.css

Lines changed: 18 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4006,12 +4006,12 @@ prm-location-items md-list prm-service-button .md-button.button-as-link,
40064006
prm-service-physical-best-offer .get_it_btn_physical,
40074007
md-input-container:after,
40084008
.slsp-citation-select-radio.md-active .md-on {
4009-
background-color: #3BBFAD !important;
4009+
background-color: #4E4A99 !important;
40104010
}
40114011

40124012
@media only screen and (max-width: 599px) {
40134013
prm-topbar .top-nav-bar {
4014-
border-color: #3BBFAD !important;
4014+
border-color: #4E4A99 !important;
40154015
}
40164016
}
40174017

@@ -4030,7 +4030,7 @@ button.switch-to-simple:hover,
40304030
#rapidoOffer prm-service-physical-best-offer .get_it_btn_digital:hover,
40314031
prm-service-physical-best-offer .get_it_btn_physical:hover,
40324032
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
4033-
background-color: #83dcd0 !important;
4033+
background-color: #393765 !important;
40344034
}
40354035

40364036
/*font color of the primary color*/
@@ -4062,12 +4062,12 @@ button#get_it_btn_digital,
40624062
prm-service-button>button>span,
40634063
prm-resource-type-filter-bar .container .box div,
40644064
prm-resource-type-filter-bar prm-icon {
4065-
color: #14413c !important;
4065+
color: #fff !important;
40664066
}
40674067

40684068
button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore-theme.md-ink-ripple,
40694069
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
4070-
border-color: #14413c !important;
4070+
border-color: #fff !important;
40714071
}
40724072

40734073

@@ -4094,13 +4094,13 @@ prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-rippl
40944094
.prm-alert-bg,
40954095
#rapidoOffer prm-rapido-no-offer-message .main_tile,
40964096
.diamond {
4097-
background-color: #8dd8d8 !important;
4097+
background-color: #99d0d0 !important;
40984098
}
40994099

41004100
.text-highlight,
41014101
mark,
41024102
prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>button {
4103-
box-shadow: inset 0 -0.15em 0 0 #8dd8d8;
4103+
box-shadow: inset 0 -0.15em 0 0 #99d0d0;
41044104
}
41054105

41064106

@@ -4110,7 +4110,7 @@ prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>butto
41104110

41114111
div.alert-bar .md-button:hover:not([disabled]),
41124112
slsp-edit-personal-details-component a.bar.alert-bar:hover {
4113-
background-color: #aff7f7 !important;
4113+
background-color: #b6fafa !important;
41144114
}
41154115

41164116

@@ -4151,70 +4151,30 @@ prm-resource-type-filter-bar button.selectedResourceTypeOption prm-icon {
41514151

41524152
/*Display "Send My Search To" facet group fully (facet group and okm link and odn-link)*/
41534153
.send-my-search-facet-group {
4154-
display: none !important;
4154+
display: block !important;
41554155
}
41564156

41574157
/*Display the "Open Knowledge Maps" link in the facet group*/
41584158
.eth-okm-link {
4159-
display: none !important;
4159+
display: block !important;
41604160
}
41614161

41624162
/*Display "Open data navigator*/
41634163
#odn-link-component {
4164-
display: none !important;
4165-
}
4166-
4167-
/************Temporary alert box*************
4168-
4169-
.iheid-alert::after,
4170-
.iheid-alert::before {
4171-
content: "";
4172-
display: table;
4173-
clear: both;
4174-
}
4175-
4176-
.iheid-alert:hover {
4177-
color: #000 !important;
4178-
background-color: #99d0d0 !important;
4179-
}
4180-
4181-
.iheid-alert {
4182-
background-color: #99d0d0 !important;
4183-
color: black;
4184-
box-shadow: 2px 1px 3px 0px rgb(0 0 0 / 8%), 0 2px 5px 0 rgb(0 0 0 / 8%);
4185-
margin: 8px 8px 4px 8px;
4186-
padding: 10px;
4187-
position: relative;
4188-
opacity: 1;
4189-
border-radius: 3px;
4190-
}
4191-
4192-
.iheid-alert a {
4193-
color: #000;
4194-
text-decoration: underline !important;
4164+
display: block !important;
41954165
}
41964166

4197-
/*Alert box close button
4167+
/************Hide collections**************/
41984168

4199-
.iheid-alert-close {
4200-
margin-left: 15px;
4201-
color: #000;
4202-
float: right;
4203-
cursor: pointer;
4204-
}
4169+
/*Hide Juscovery in collections*/
42054170

4206-
.iheid-alert-close:hover {
4207-
color: #00802F;
4171+
prm-gallery-collection[collection-id="81546771520005501"] {
4172+
display: none;
42084173
}
42094174

4210-
a:hover#alert {
4211-
background-color: rgba(47, 47, 47, 0.1) !important;
4212-
}*/
4213-
/************Hide collections**************/
4175+
/*Hide Collection path in full display*/
42144176

4215-
/*Hide Juscovery*/
4216-
4217-
prm-gallery-collection[collection-id="81546771520005501"] {
4177+
prm-record-collection-paths {
42184178
display: none;
42194179
}
42204180

@@ -4239,5 +4199,4 @@ prm-gallery-collection[collection-id="81546771520005501"] {
42394199
/*****************************************************************************/
42404200

42414201

4242-
/*****************************************************************************/
4243-
4202+
/*****************************************************************************/

js/modules/prm-get-it-request-after/slsp-refine-journal-request/slsp-refine-journal-request.controller.js

Lines changed: 82 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -11,117 +11,91 @@ export class slspRefineJournalRequestController {
1111

1212

1313
$doCheck() {
14-
this.parentCtrl = this.afterCtrl.parentCtrl;
15-
16-
let isRefined = this.parentCtrl._refined;
17-
let isPhysicalForm = this.parentCtrl.openphysicalform.openPhysicalForm;
18-
let isPhysicalJournal = this.parentCtrl.isPhysicalJournal();
19-
let refineOfferDisabled = this.parentCtrl._refineOfferDisabled;
20-
let volumeData = this.parentCtrl.formData.myVolume;
21-
let noteData = this.parentCtrl.formData.myNote;
22-
let publicationData = this.parentCtrl.formData.myPublicationDate;
23-
// Prüfen, ob #physicalGetItRequest die Klasse no-best-offer hat
24-
const physicalGetItRequestElem = document.querySelector('#physicalGetItRequest');
25-
const hasNoBestOfferClass = physicalGetItRequestElem && physicalGetItRequestElem.classList.contains('no-best-offer');
26-
27-
28-
// console.log('openphysicalform', this.parentCtrl.openphysicalform.openPhysicalForm);
29-
// console.log('parentCtrl', this.parentCtrl);
30-
// console.log('volumeData', volumeData);
31-
// console.log('_refineOfferDisabled)', this.parentCtrl._refineOfferDisabled);
32-
33-
/* console.log('_refined', this.parentCtrl._refined);
34-
console.log('sendDisabled', this.parentCtrl.sendDisabled());
35-
36-
*/
37-
38-
// console.log('isPhysicalJournal', this.parentCtrl.isPhysicalJournal());
39-
//
40-
// console.log('_refineOfferInProgress', this.parentCtrl._refineOfferInProgress);
41-
// console.log('_isPhysicalJournalFormValid',this.parentCtrl._isPhysicalJournalFormValid);
42-
// console.log('isJournal',this.parentCtrl.isJournal());
43-
// console.log('isdigitaloffer',this.parentCtrl.isdigitaloffer);
44-
// console.log('getNoOfferOfferDetails',this.parentCtrl.getNoOfferOfferDetails());
45-
//console.log('formData:',this.parentCtrl.formData);
46-
//console.log('requestSubmitted:',this.parentCtrl._requestSubmitted);
47-
48-
if (isPhysicalJournal && isPhysicalForm) {
49-
if (!publicationData) {
50-
this.disableRefineButton();
51-
} else {
52-
this.enableRefineButton();
53-
}
54-
if (
55-
(this._lastVolumeData !== undefined && this._lastVolumeData !== volumeData) ||
56-
(this._lastPublicationData !== undefined && this._lastPublicationData !== publicationData)
57-
) {
58-
this.parentCtrl._refined = false;
59-
}
60-
this._lastVolumeData = volumeData;
61-
this._lastPublicationData = publicationData;
62-
63-
this.parentCtrl.noteField.label = 'customized.journal.note';
64-
65-
// Button-Handler nur einmal registrieren
66-
if (!this._submitHandlerRegistered) {
67-
const submitBtn = document.querySelector('button.button-with-icon.button-confirm');
68-
if (submitBtn) {
69-
submitBtn.addEventListener('click', (event) => {
70-
// Mische publicationData und noteData vor dem Absenden
71-
let publicationData = this.parentCtrl.formData.myPublicationDate;
72-
let noteData = this.parentCtrl.formData.myNote;
73-
let currentNote = noteData || '';
74-
let alreadyCombined = currentNote.includes(publicationData);
75-
let combinedNote = '';
76-
if (!alreadyCombined) {
77-
if (publicationData && noteData) {
78-
combinedNote = publicationData + ' | ' + noteData;
79-
} else if (publicationData) {
80-
combinedNote = publicationData;
81-
} else if (noteData) {
82-
combinedNote = noteData;
83-
}
84-
this.parentCtrl.formData.myNote = combinedNote;
85-
}
86-
}, true); // Capture-Phase
87-
this._submitHandlerRegistered = true;
88-
}
89-
}
90-
91-
if (!isRefined || hasNoBestOfferClass || refineOfferDisabled) {
92-
this.disableRequestButton();
93-
} else {
94-
this.enableRequestButton();
95-
}
96-
97-
let resetButton = angular.element(document.querySelector('span[translate="nui.reset"]'));
98-
if (resetButton && resetButton.parent()) {
99-
resetButton.parent().addClass('hidden');
100-
}
101-
let getItNgrs = angular.element(document.querySelector('div.getItNgrs'));
102-
getItNgrs.addClass('physical-journal');
103-
104-
//console.log('podID:', this.parentCtrl._bestOffer.podId);
105-
106-
/* reading room POD */
107-
if (this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452167832730000041' ||
108-
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452167827350000041' ||
109-
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452497325370000041' ||
110-
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452497929300000041' ||
111-
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452084165700000041' ||
112-
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '529457897220000041') {
113-
114-
let pickupInfo = document.querySelectorAll('prm-service-ngrs');
115-
angular.element(pickupInfo).addClass('reading-room');
116-
117-
}
14+
this.parentCtrl = this.afterCtrl.parentCtrl;
15+
16+
let isRefined = this.parentCtrl._refined;
17+
let isPhysicalForm = this.parentCtrl.openphysicalform.openPhysicalForm;
18+
let isPhysicalJournal = this.parentCtrl.isPhysicalJournal();
19+
let refineOfferDisabled = this.parentCtrl._refineOfferDisabled;
20+
let volumeData = this.parentCtrl.formData.myVolume;
21+
let noteData = this.parentCtrl.formData.myNote;
22+
let publicationData = this.parentCtrl.formData.myPublicationDate;
23+
// Prüfen, ob #physicalGetItRequest die Klasse no-best-offer hat
24+
const physicalGetItRequestElem = document.querySelector('#physicalGetItRequest');
25+
const hasNoBestOfferClass = physicalGetItRequestElem && physicalGetItRequestElem.classList.contains('no-best-offer');
26+
27+
28+
// console.log('openphysicalform', this.parentCtrl.openphysicalform.openPhysicalForm);
29+
// console.log('parentCtrl', this.parentCtrl);
30+
// console.log('volumeData', volumeData);
31+
// console.log('_refineOfferDisabled)', this.parentCtrl._refineOfferDisabled);
32+
33+
/* console.log('_refined', this.parentCtrl._refined);
34+
console.log('sendDisabled', this.parentCtrl.sendDisabled());
35+
36+
*/
37+
38+
// console.log('isPhysicalJournal', this.parentCtrl.isPhysicalJournal());
39+
//
40+
// console.log('_refineOfferInProgress', this.parentCtrl._refineOfferInProgress);
41+
// console.log('_isPhysicalJournalFormValid',this.parentCtrl._isPhysicalJournalFormValid);
42+
// console.log('isJournal',this.parentCtrl.isJournal());
43+
// console.log('isdigitaloffer',this.parentCtrl.isdigitaloffer);
44+
// console.log('getNoOfferOfferDetails',this.parentCtrl.getNoOfferOfferDetails());
45+
//console.log('formData:',this.parentCtrl.formData);
46+
//console.log('requestSubmitted:',this.parentCtrl._requestSubmitted);
47+
48+
if (isPhysicalJournal && isPhysicalForm) {
49+
if (!publicationData) {
50+
this.disableRefineButton();
51+
} else {
52+
this.enableRefineButton();
11853
}
119-
// neue Bedingung für Bücher
120-
if (!isPhysicalJournal && isPhysicalForm) {
121-
let getItNgrs = angular.element(document.querySelector('div.getItNgrs'));
122-
getItNgrs.addClass('physical-book');
54+
if (
55+
(this._lastVolumeData !== undefined && this._lastVolumeData !== volumeData) ||
56+
(this._lastPublicationData !== undefined && this._lastPublicationData !== publicationData)
57+
) {
58+
this.parentCtrl._refined = false;
12359
}
60+
this._lastVolumeData = volumeData;
61+
this._lastPublicationData = publicationData;
12462

63+
this.parentCtrl.noteField.label = 'customized.journal.note';
64+
65+
66+
if (!isRefined || hasNoBestOfferClass || refineOfferDisabled) {
67+
this.disableRequestButton();
68+
} else {
69+
this.enableRequestButton();
70+
}
71+
72+
let resetButton = angular.element(document.querySelector('span[translate="nui.reset"]'));
73+
if (resetButton && resetButton.parent()) {
74+
resetButton.parent().addClass('hidden');
75+
}
76+
let getItNgrs = angular.element(document.querySelector('div.getItNgrs'));
77+
getItNgrs.addClass('physical-journal');
78+
79+
//console.log('podID:', this.parentCtrl._bestOffer.podId);
80+
81+
/* reading room POD */
82+
if (this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452167832730000041' ||
83+
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452167827350000041' ||
84+
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452497325370000041' ||
85+
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452497929300000041' ||
86+
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '452084165700000041' ||
87+
this.parentCtrl._bestOffer !== undefined && this.parentCtrl._bestOffer.podId == '529457897220000041') {
88+
89+
let pickupInfo = document.querySelectorAll('prm-service-ngrs');
90+
angular.element(pickupInfo).addClass('reading-room');
91+
92+
}
93+
}
94+
// neue Bedingung für Bücher
95+
if (!isPhysicalJournal && isPhysicalForm) {
96+
let getItNgrs = angular.element(document.querySelector('div.getItNgrs'));
97+
getItNgrs.addClass('physical-book');
98+
}
12599

126100
}
127101

0 commit comments

Comments
 (0)