Skip to content

Feat/new formular5 #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djuarezgf merged 2 commits into from
May 6, 2026
Merged

Feat/new formular5 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f51020
chore: various small changes and fixes
thkoehler11 May 6, 2026
bb3ab1b
chore: various small changes and fixes
thkoehler11 May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/BridgeheadOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
:context="fetchContext(bridgehead)"
:project-manager-backend-service="projectManagerBackendService"
icon-class="bi bi-download"
button-class="download-button"
button-class="download-button no-y-padding"
:module="Module.PROJECT_DOCUMENTS_MODULE"
:action="Action.DOWNLOAD_VOTUM_ACTION"
/>
Expand All @@ -70,7 +70,7 @@
:context="fetchContext(bridgehead)"
:project-manager-backend-service="projectManagerBackendService"
icon-class="bi bi-download"
button-class="download-button"
button-class="download-button no-y-padding"
:module="Module.PROJECT_DOCUMENTS_MODULE"
:action="Action.DOWNLOAD_VOTUM_FOR_ALL_BRIDGEHEADS_ACTION"
/>
Expand Down
5 changes: 4 additions & 1 deletion src/components/DownloadButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,8 @@ export default class DownloadButton extends Vue {
</template>

<style scoped>

.no-y-padding {
padding-top: 0;
padding-bottom: 0;
}
</style>
14 changes: 9 additions & 5 deletions src/components/NavBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<template>
<div>
<nav class="navbar navbar-dark custom-navbar">
<router-link class="navbar-brand" to="/">
<i class="bi bi-boxes navbar-icon" v-html="'&nbsp' + frontendName"></i>
</router-link>
<div class="navbar__logo">
<a href="https://dktk.dkfz.de/" class="navbar-brand dk-logo">
<span class="dk-logo__sign"><img src="../assets/logo-dktk-sign.svg" alt="dktk"></span>
Expand All @@ -13,6 +10,9 @@
<span class="dk-logo__slogan">Deutsches Konsortium für <br> Translationale Krebsforschung</span>
</a>
</div>
<router-link class="navbar-brand" to="/">
<span class="navbar-title">{{frontendName}}</span>
</router-link>
<div class="user-logout-container">
<!-- User information -->
<span class="user-info" :title="auth.getEmail()">
Expand Down Expand Up @@ -100,9 +100,13 @@ export default defineComponent({
display: flex;
align-items: center;
justify-content: space-between;
padding-left: 5%;
padding-left: 2%;
}
.navbar-title {
color: #00489c;
font-weight: bold;
font-size: larger;
}

.navbar-icon {
margin-right: 5px;
color: #00489c;
Expand Down
41 changes: 33 additions & 8 deletions src/components/ProjectDashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div style="display: flex; min-height: 100vh;">
<div class="container custom-width-projects">
<div class="row">
<div class="box-header"><span>Requests</span><img src="../assets/newsletter.png" width="40" height="40"> </div>
<div class="box-header"><span>Requests</span></div>
<!--<div class="col-md-4 text-end" v-if="isProjectManagerAdmin">
<button @click="toggleNotification" class="btn btn-dark notification-button"
style="padding-right:2%; background:none; border:none; color:#007bff"><i style="font-size: x-large" class="bi bi-chat-right-text-fill"></i>
Expand All @@ -16,12 +16,12 @@
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th scope="col">Data Request Number (DRN)</th>
<th scope="col">Request ID</th>
<th scope="col">Title</th>
<th scope="col">Applicant</th>
<th scope="col">Created at</th>
<th scope="col">Author</th>
<th scope="col">Created on</th>
<th scope="col" style="display: flex;justify-content: space-between;align-items: baseline">
<span>Phase</span><span class="filter">
<span>Status</span><span class="filter">
<select v-model="selectedState" class="form-select" @change="changeState()">
<option v-for="value in projectStates" :key="value" :value="value">{{ value }}</option>
</select>
Expand All @@ -33,7 +33,7 @@
<tbody>
<tr v-for="(project, index) in projects" :key="index">
<td>{{ project.code }}</td>
<td>{{ project.label }}</td>
<td><router-link :to="{ name: 'ProjectView', query: { 'project-code': project.code } }" class="label-link">{{ project.label }}</router-link></td>
<td>
<UserAndEmail
:first-name="project?.creatorName"
Expand All @@ -44,7 +44,7 @@
<td>{{ project.state }}</td>
<td>
<router-link :to="{ name: 'ProjectView', query: { 'project-code': project.code } }">
<i class="bi bi-folder-fill"></i>
<i class="bi bi-folder-fill action-icon"></i>
</router-link>
</td>
</tr>
Expand Down Expand Up @@ -237,7 +237,13 @@ export default defineComponent({
background-color: white;
height: 100%;
}

table {
border-color: rgba(0,72,156,.95);
}
thead > tr > th {
background-color: rgba(0,72,156,.95)!important;
color: white;
}
.box-header {
padding: 10px 30px 10px 2%;
color: rgb(0, 56, 124);;
Expand Down Expand Up @@ -305,5 +311,24 @@ th {
font-size: smaller;
text-align: left;
cursor: pointer;
color: white;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='%23ffffff'%3E%3Cpath d='M5.5 7.5L10 12l4.5-4.5' stroke='%23ffffff' stroke-width='2' fill='none' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");

}
.form-select option {
color: black;
}
.form-select option:hover {
color: rgba(0,72,156,.95);
}
.label-link {
text-decoration: none;
color: rgb(51,142,195);
}
.label-link:hover {
text-decoration: underline;
}
.action-icon {
color: rgb(51,142,195);
}
</style>
13 changes: 8 additions & 5 deletions src/components/ProjectFieldRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,9 @@ export default class ProjectFieldRow extends Vue {
return this.type === FormDataType.BOOLEAN
}

isComments(): boolean {
return this.includesEditProjectParam(EditProjectParam.FORM_FIELDS) && this.fieldKey === 'Comments';
}
isDraft(): boolean {
return this.draftDialogCurrentStep !== undefined
}
Expand Down Expand Up @@ -517,11 +520,11 @@ export default class ProjectFieldRow extends Vue {
</div>
<div v-if="!configurations?.get(step)?.project?.isCustomConfigSelected"
style="text-align: right;margin-bottom:2%">
<button @click.stop="showDetails[index]=!showDetails[index]"
<!--<button @click.stop="showDetails[index]=!showDetails[index]"
style="background: none; border:none; color: #007bff;">
<span v-if="!showDetails[index]">show details</span>
<span v-if="showDetails[index]">hide details</span>
</button>
</button>-->
</div>
<table v-if="showDetails[index]" style="text-align: left">
<tr v-for="(param, key) in configurations?.get(step)?.project?.outputs?.[0]" :key="key">
Expand Down Expand Up @@ -593,7 +596,7 @@ export default class ProjectFieldRow extends Vue {
data-placement="top" title="Copy Query to Clipboard"
><i
:class="copiedToClipboard ? 'bi bi-clipboard-check' : 'bi bi-copy'"
@click="copyToClipboard(editedValue[0])"></i>
@click="copyToClipboard(editedValue[1])"></i>
</button>
<button v-if="redirectUrl !== null && redirectUrl !== undefined"
class="btn btn-primary query-link-button"
Expand Down Expand Up @@ -621,7 +624,7 @@ export default class ProjectFieldRow extends Vue {
></lens-query-explain-button>-->
</div>

<div v-else-if="isDescription() || isCohortDefinition()" :style="!isDraft() || isSummaryStep() ? 'width:100%' : 'width: 75%'">
<div v-else-if="isDescription() || isCohortDefinition() || isComments()" :style="!isDraft() || isSummaryStep() ? 'width:100%' : 'width: 75%'">
<div class="grow-wrap" :data-replicated-value="editedValue[0]">
<textarea
type="text"
Expand All @@ -637,7 +640,7 @@ export default class ProjectFieldRow extends Vue {
<div v-else-if="isDescriptionUpload()" style="margin:1rem 0 0 1rem">
<UploadButton :context="context" :project-manager-backend-service="projectManagerBackendService"
:module="Module.PROJECT_DOCUMENTS_MODULE" :action="uploadAction"
text="Upload document" :call-refresh-context="exitAndCallRefreshContext" :is-file="true" :exists-file="existsFile"
text="Upload project description" :call-refresh-context="exitAndCallRefreshContext" :is-file="true" :exists-file="existsFile"
:file-name="fieldValue[1]" :toggle-input="true"/>
</div>

Expand Down
Loading
Loading