Skip to content

FOUR-30502: Align Prospect Process Screens with Mockups #8770

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

Closed
eiresendez wants to merge 1 commit into from
Closed

FOUR-30502: Align Prospect Process Screens with Mockups #8770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions resources/js/processes-catalogue/components/ProcessHeaderStart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<div>
<div class="header-mobile">
<div :class="{ 'prospect-process-shell': isProspectProcess }">
<div class="header-mobile prospect-process-header-mobile">
<div class="title">
{{ process.name }}
</div>
</div>
<div class="header card card-body card-custom">
<div class="header card card-body card-custom prospect-process-header">
<div class="d-flex justify-content-between">
<div class="d-flex align-items-center flex-grow-1">
<i class="fas fa-chevron-left mr-2 custom-color"
Expand Down Expand Up @@ -84,6 +84,11 @@ export default {
singleStartEvent: null,
}
},
computed: {
isProspectProcess() {
return (this.process?.name || "").toLowerCase().includes("prospect");
},
},
mounted() {
this.getStartEvents();
},
Expand Down
1 change: 1 addition & 0 deletions resources/js/processes-catalogue/components/ProcessScreen.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<display-screen
v-if="showScreen"
:screen="screen"
:process="process"
/>
<create-template-modal
id="create-template-modal"
Expand Down
43 changes: 32 additions & 11 deletions resources/js/processes-catalogue/components/utils/DisplayScreen.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,46 @@
<template>
<div class="screen-container">
<vue-form-renderer
v-model="previewData"
:config="screen.config"
:computed="screen.computed"
:custom-css="screen.custom_css"
:watchers="screen.watchers"
:show-errors="true"
/>
<div
class="screen-container"
:class="{ 'prospect-process-shell': isProspectProcess }">
<div class="prospect-screen-shell">
<div class="prospect-screen-frame">
<vue-form-renderer
v-model="previewData"
class="prospect-form-renderer"
:config="screen.config"
:computed="screen.computed"
:custom-css="screen.custom_css"
:watchers="screen.watchers"
:show-errors="true"
/>
</div>
</div>
</div>
</template>

<script>
export default {
props: ["screen"],
props: {
screen: {
type: Object,
required: true,
},
process: {
type: Object,
default: null,
},
},
data() {
return {
disabled: false,
previewData: {},
};
},
computed: {
isProspectProcess() {
return (this.process?.name || "").toLowerCase().includes("prospect");
},
},
watch: {
screen: {
deep: true,
Expand All @@ -33,6 +54,6 @@ export default {

<style scoped>
.screen-container {
padding: 16px;
padding: 16px 0;
}
</style>
26 changes: 17 additions & 9 deletions resources/js/requests/components/SummaryMobile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
<template v-if="showSummary">
<div>
<template v-if="showScreenSummary">
<div class="p-3">
<vue-form-renderer
ref="screen"
v-model="dataSummary"
:config="screenSummary.config"
:computed="screenSummary.computed"
/>
<div class="p-3 prospect-summary-section">
<div class="prospect-screen-shell">
<div class="prospect-screen-frame prospect-screen-frame--compact">
<vue-form-renderer
ref="screen"
v-model="dataSummary"
:config="screenSummary.config"
:custom-css="screenSummary.custom_css"
:computed="screenSummary.computed"
/>
</div>
</div>
</div>
</template>
<template v-if="showScreenRequestDetail && !showScreenSummary">
<div class="card">
<div class="card-body">
<div class="prospect-summary-section">
<div class="prospect-screen-shell">
<div class="prospect-screen-frame prospect-screen-frame--compact">
<vue-form-renderer
ref="screenRequestDetail"
v-model="dataSummary"
:config="screenRequestDetail"
:custom-css="request.request_detail_screen && request.request_detail_screen.custom_css"
/>
</div>
</div>
</div>
</template>
Expand Down
24 changes: 19 additions & 5 deletions resources/js/requests/components/screenDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<template>
<div class="card h-100">
<b-overlay
<div class="prospect-screen-shell">
<div class="prospect-screen-frame prospect-screen-frame--compact">
<b-overlay
id="overlay-background"
:show="disabled"
:variant="variant"
:opacity="opacity"
:blur="blur"
rounded="sm"
>
<div class="w-100 d-print-none" align="right">
<div class="prospect-screen-toolbar w-100 d-print-none">
<button
type="button"
@click="print"
Expand All @@ -20,7 +21,7 @@
<i class="fas fa-print"></i> {{ $t("Print") }}
</button>
</div>
<div v-for="page in printablePages" :key="page" class="card">
<div v-for="page in printablePages" :key="page" class="card prospect-screen-page">
<div class="card-body h-100" :style="cardStyles">
<component
ref="print"
Expand All @@ -29,13 +30,16 @@
:data="formData"
@update="onUpdate"
:config="json"
:computed="rowData.computed"
:custom-css="rowData.custom_css"
:watchers="rowData.watchers"
csrf-token=""
submiturl=""
token-id=""
/>
</div>
</div>
<div class="w-100 d-print-none" align="right">
<div class="prospect-screen-toolbar w-100 d-print-none">
<button
type="button"
@click="print"
Expand All @@ -48,6 +52,7 @@
</button>
</div>
</b-overlay>
</div>
</div>
</template>

Expand Down Expand Up @@ -230,3 +235,12 @@
}
</script>

<style scoped>
.prospect-screen-page + .prospect-screen-page {
margin-top: 1rem;
}

.prospect-screen-toolbar {
align-items: center;
}
</style>
3 changes: 3 additions & 0 deletions resources/views/processes-catalogue/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
@section('meta')
<meta name="request-id" content="">
@endsection
@section('css')
@include('shared.prospect-process-shell-styles')
@endsection

@section('content')
<div id="processes-catalogue" class="px-3 tw-h-[99%] tw-overflow-hidden">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/processes-catalogue/mobile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
@endsection

@section('css')

@include('shared.prospect-process-shell-styles')
@endsection
6 changes: 5 additions & 1 deletion resources/views/requests/preview.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
@section('meta')
<meta name="request-id" content="{{ $request->getKey() }}">
@endsection
@section('css')
@include('shared.prospect-process-shell-styles')
@endsection


@section('sidebar')
Expand All @@ -20,7 +23,8 @@
]])
@endsection
@section('content')
<div id="request" class="container d-print-block">
@php($isProspectProcess = \Illuminate\Support\Str::contains(\Illuminate\Support\Str::lower($request->process->name ?? ''), 'prospect'))
<div id="request" class="container d-print-block {{ $isProspectProcess ? 'prospect-process-shell' : '' }}">
<div class="row">
<div class="col-sm-12">
<screen-detail :row-data="config" v-bind:can-print="true" :timeout-on-load="true">
Expand Down
28 changes: 19 additions & 9 deletions resources/views/requests/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
@section('meta')
<meta name="request-id" content="{{ $request->id }}">
@endsection
@section('css')
@include('shared.prospect-process-shell-styles')
@endsection

@section('breadcrumbs')
@include('shared.breadcrumbs', [
Expand All @@ -22,7 +25,8 @@
])
@endsection
@section('content')
<div id="request">
@php($isProspectProcess = \Illuminate\Support\Str::contains(\Illuminate\Support\Str::lower($request->process->name ?? ''), 'prospect'))
<div id="request" class="{{ $isProspectProcess ? 'prospect-process-shell' : '' }}">
<div class="menu-mask" :class="{ 'menu-open': showMenu }"></div>
<div class="info-main" :class="{ 'menu-open': showMenu }">
<div class="container-fluid px-3">
Expand Down Expand Up @@ -119,20 +123,26 @@
<div class="card card-body border-top-0 p-0"
v-bind:class="{ 'tab-pane':true, active: showSummary && !activePending}" id="summary" role="tabpanel"
aria-labelledby="summary-tab">
<template v-if="showSummary">
<template v-if="showScreenSummary">
<div class="p-3">
<vue-form-renderer ref="screen" :config="screenSummary.config" v-model="dataSummary"
:custom-css="screenSummary?.custom_css"
:computed="screenSummary.computed" />
<template v-if="showSummary">
<template v-if="showScreenSummary">
<div class="p-3 prospect-summary-section">
<div class="prospect-screen-shell">
<div class="prospect-screen-frame prospect-screen-frame--compact">
<vue-form-renderer ref="screen" :config="screenSummary.config" v-model="dataSummary"
:custom-css="screenSummary?.custom_css"
:computed="screenSummary.computed" />
</div>
</div>
</div>
</template>
<template v-if="showScreenRequestDetail && !showScreenSummary">
<div class="card">
<div class="card-body">
<div class="prospect-summary-section">
<div class="prospect-screen-shell">
<div class="prospect-screen-frame prospect-screen-frame--compact">
<vue-form-renderer ref="screenRequestDetail" :config="screenRequestDetail.config"
:custom-css="screenRequestDetail.custom_css"
v-model="dataSummary" />
</div>
</div>
</div>
</template>
Expand Down
10 changes: 5 additions & 5 deletions resources/views/requests/showMobile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
@section('title')
{{ __('Request Detail') }}
@endsection
@section('css')
@include('shared.prospect-process-shell-styles')
@endsection
@section('content_mobile')
<div v-cloak id="requestMobile">
@php($isProspectProcess = \Illuminate\Support\Str::contains(\Illuminate\Support\Str::lower($request->process->name ?? ''), 'prospect'))
<div v-cloak id="requestMobile" class="{{ $isProspectProcess ? 'prospect-process-shell' : '' }}">
<navbar-request-mobile :title="request.name"></navbar-request-mobile>
<!--Header-->
@if (shouldShow('requestStatusContainer'))
Expand Down Expand Up @@ -187,7 +191,3 @@ class="tab-pane card card-body border-top-0 p-3"
});
</script>
@endsection

@section('css')

@endsection
Loading
Loading