Skip to content

Commit

Permalink
#2615 Pr tweaks (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lmallika86
lmallika86 authored Mar 5, 2020
1 parent 3d9239c commit 23ed511
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
42 changes: 21 additions & 21 deletions src/components/Dashboard/FilingHistoryList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
<v-expansion-panels v-if="filedItems.length > 0" v-model="panel">
<v-expansion-panel
class="align-items-top filing-history-item"
v-for="(item, index) in filedItems"
v-for="(filing, index) in filedItems"
:key="index"
>
<v-expansion-panel-header class="filing-item-toggle">
<div class="list-item">
<div class="filing-label">
<h3>{{item.title}} {{applyCorrectionTag(item)}}</h3>
<h3>{{filing.title}} {{applyCorrectionTag(filing)}}</h3>
<div class="list-item__subtitle">
<v-scale-transition v-if="isCoaFutureEffective(item.type, item.status)">
<v-scale-transition v-if="isCoaFutureEffective(filing.type, filing.status)">
<v-tooltip top content-class="pending-tooltip">
<template v-slot:activator="{ on }">
<div id="pending-alert" class="list-item__subtitle" v-on="on">
<span>FILED AND PENDING (filed by {{item.filingAuthor}} on {{item.filingDate}})</span>
<span>FILED AND PENDING (filed by {{filing.filingAuthor}} on {{filing.filingDate}})</span>
<v-icon color="yellow" small>mdi-alert</v-icon>
</div>
</template>
<span>The updated office addresses will be legally effective on {{item.filingEffectiveDate}},
<span>The updated office addresses will be legally effective on {{filing.filingEffectiveDate}},
12:01 AM (Pacific Time). No other filings are allowed until then.</span>
</v-tooltip>
</v-scale-transition>
<span v-else>FILED AND PAID (filed by {{item.filingAuthor}} on {{item.filingDate}})</span>
<template v-if="item.comments.length > 0">
<span v-else>FILED AND PAID (filed by {{filing.filingAuthor}} on {{filing.filingDate}})</span>
<template v-if="filing.comments.length > 0">
<span>
<v-icon small>mdi-message-reply</v-icon>
Detail{{item.comments.length > 1 ? "s" : ""}} ({{item.comments.length}})
Detail{{filing.comments.length > 1 ? "s" : ""}} ({{filing.comments.length}})
</span>
</template>
</div>
Expand All @@ -49,11 +49,11 @@
<div class="filing-item__actions">
<div class="toggle-info">
<template v-if="panel === index">
<span v-if="item.paperOnly">Close</span>
<span v-if="filing.paperOnly">Close</span>
<span v-else>Hide Documents</span>
</template>
<template v-else>
<span v-if="item.paperOnly">Request a Copy</span>
<span v-if="filing.paperOnly">Request a Copy</span>
<span v-else>View Documents</span>
</template>
</div>
Expand All @@ -67,13 +67,13 @@
</template>
<v-list dense>
<v-list-item-group color="primary">
<v-list-item :disabled="hasBlockerFiling || item.isCorrection">
<v-list-item :disabled="hasBlockerFiling || filing.isCorrection">
<v-list-item-icon>
<v-icon>mdi-file-document-edit-outline</v-icon>
</v-list-item-icon>
<v-list-item-title
class="file-correction-item"
@click="correctThisItem(item)"
@click="correctThisItem(filing)"
>
File a Correction
</v-list-item-title>
Expand All @@ -85,7 +85,7 @@
</v-list-item-icon>
<v-list-item-title
class="add-detail-comment-item"
@click="showCommentDialog(item.filingId)"
@click="showCommentDialog(filing.filingId)"
>
Add Detail
</v-list-item-title>
Expand All @@ -98,8 +98,8 @@
</v-expansion-panel-header>

<v-expansion-panel-content>
<v-list dense class="mt-n1 mb-n3 pt-0 pb-0" v-if="!item.paperOnly">
<v-list-item class="pl-0 pr-0" v-for="(document, index) in item.filingDocuments" :key="index">
<v-list dense class="mt-n1 mb-n3 pt-0 pb-0" v-if="!filing.paperOnly">
<v-list-item class="pl-0 pr-0" v-for="(document, index) in filing.filingDocuments" :key="index">
<v-btn text color="primary"
class="download-document-btn pl-1 pr-2"
@click="downloadDocument(document)"
Expand All @@ -111,10 +111,10 @@
</v-btn>
</v-list-item>

<v-list-item class="pl-0 pr-0" v-if="item.paymentToken">
<v-list-item class="pl-0 pr-0" v-if="filing.paymentToken">
<v-btn text color="primary"
class="download-receipt-btn pl-1 pr-2"
@click="downloadReceipt(item)"
@click="downloadReceipt(filing)"
:disabled="loadingReceipt"
:loading="loadingReceipt"
>
Expand All @@ -123,10 +123,10 @@
</v-btn>
</v-list-item>

<v-list-item class="pl-0 pr-0" v-if="!item.paperOnly">
<v-list-item class="pl-0 pr-0" v-if="!filing.paperOnly">
<v-btn text color="primary"
class="download-all-btn pl-1 pr-2"
@click="downloadAll(item)"
@click="downloadAll(filing)"
:disabled="loadingAll"
:loading="loadingAll"
>
Expand All @@ -136,7 +136,7 @@
</v-list-item>
</v-list>

<div class="paper-filings body-2" v-if="item.paperOnly">
<div class="paper-filings body-2" v-if="filing.paperOnly">
<p>Filings completed <strong>before March 10, 2019</strong> are only available from the BC Registry
as paper documents.</p>
<p>To request copies of paper documents, contact BC Registry Staff with the document you require and
Expand All @@ -156,7 +156,7 @@

<!-- the detail comments section -->
<details-list
:filing=item
:filing=filing
:isTask="false"
@showCommentDialog="showCommentDialog($event)"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/views/Dashboard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<v-btn text small color="primary"
id="standalone-addresses-button"
class="change-btn"
:disabled="hasBlockerFiling || coaPending"
:disabled="hasBlockerFiling"
@click.native.stop="proceedCoa()"
>
<v-icon small>mdi-pencil</v-icon>
Expand All @@ -87,7 +87,7 @@
<v-btn text small color="primary"
id="standalone-directors-button"
class="change-btn"
:disabled="hasBlockerFiling || coaPending"
:disabled="hasBlockerFiling"
@click.native.stop="goToStandaloneDirectors()"
>
<v-icon small>mdi-pencil</v-icon>
Expand Down

0 comments on commit 23ed511

Please sign in to comment.