Commit d3351784 authored by Kristjan Kruus's avatar Kristjan Kruus

Merge pull request #47 in RIHA/riha-browser from test to develop

* commit 'cbd7a1be':
  producer-edit-documents.component.html edited online with Bitbucket
  producer-details-legislations.component.html edited online with Bitbucket
  producer-details-documents.component.html edited online with Bitbucket
  login-link-component.html edited online with Bitbucket
  producer-details-issues.component.html edited online with Bitbucket
  producer-edit-documents.component.html edited online with Bitbucket
  producer-edit-objects.component.html edited online with Bitbucket
  producer-details-objects.component.html edited online with Bitbucket
  producer-edit-objects.component.html edited online with Bitbucket
  producer-details-security.component.html edited online with Bitbucket
  producer-details-legislations.component.html edited online with Bitbucket
  producer-details-documents.component.html edited online with Bitbucket
  producer-edit-documents.component.html edited online with Bitbucket
  approver-issue-details.component.html edited online with Bitbucket
  approver-issue-details.component.html edited online with Bitbucket
  approver-issue-details.component.html edited online with Bitbucket
parents 474e1cd5 cbd7a1be
......@@ -15,7 +15,7 @@
<span *ngIf="feedback.status == 'OPEN'"><i class="fa fa-exclamation-circle text-danger" aria-hidden="true"></i> Aktiivne</span>
<span *ngIf="feedback.status == 'CLOSED'"><i class="fa fa-check-circle text-success" aria-hidden="true"></i> Suletud</span><br>
<span *ngIf="feedback.type !=null">
<span class="text-muted">Arutelu tüüp:</span>
<span class="text-muted" style="margin-right:3px;">Arutelu tüüp:</span>
<strong *ngIf="feedback.type && classifiers.issue_type[feedback.type]">{{classifiers.issue_type[feedback.type].value}}</strong>
<span *ngIf="feedback.status == 'OPEN'"><br>Otsuse tähtpäev:
<span [ngClass]="{'text-danger': deadlinePassed}">{{ feedback.decisionDeadline }}</span>
......@@ -40,22 +40,22 @@
</div>
</div>
<div *ngIf="reply.entityType == 'ISSUE_EVENT' && reply.type == 'CLOSED' && !reply.resolutionType" class="card-text ml-4">
<i class="fa fa-check-circle text-success" aria-hidden="true"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> märkis selle arutelu lahendatuks {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
<i class="fa fa-check-circle text-success" aria-hidden="true" style="margin-right:3px;"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> märkis selle arutelu lahendatuks {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
</div>
<div *ngIf="reply.entityType == 'ISSUE_EVENT' && reply.type == 'CLOSED' && reply.resolutionType == classifiers.issue_resolution_type.NEGATIVE.code" class="card-text ml-4">
<i class="fa fa-check-circle text-success" aria-hidden="true"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> andis kooskõlastamise koondotsuse <span class="text-danger font-weight-bold">mittekooskõlastatud</span> ja sulges arutelu {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
<i class="fa fa-check-circle text-success" aria-hidden="true" style="margin-right:3px;"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> andis kooskõlastamise koondotsuse <span class="text-danger font-weight-bold">mittekooskõlastatud</span> ja sulges arutelu {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
</div>
<div *ngIf="reply.entityType == 'ISSUE_EVENT' && reply.type == 'CLOSED' && reply.resolutionType == classifiers.issue_resolution_type.POSITIVE.code" class="card-text ml-4">
<i class="fa fa-check-circle text-success" aria-hidden="true"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> andis kooskõlastamise koondotsuse <span class="text-success font-weight-bold">kooskõlastatud</span> ja sulges arutelu {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
<i class="fa fa-check-circle text-success" aria-hidden="true" style="margin-right:3px;"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> andis kooskõlastamise koondotsuse <span class="text-success font-weight-bold">kooskõlastatud</span> ja sulges arutelu {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
</div>
<div *ngIf="reply.entityType == 'ISSUE_EVENT' && reply.type == 'DECISION' && reply.resolutionType == classifiers.issue_resolution_type.POSITIVE.code" class="card-text ml-4">
<i class="fa fa-check-circle text-success" aria-hidden="true"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> kooskõlastas {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
<i class="fa fa-check-circle text-success" aria-hidden="true" style="margin-right:3px;"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> kooskõlastas {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
</div>
<div *ngIf="reply.entityType == 'ISSUE_EVENT' && reply.type == 'DECISION' && reply.resolutionType == classifiers.issue_resolution_type.NEGATIVE.code" class="card-text ml-4">
<i class="fa fa-exclamation-circle text-danger" aria-hidden="true"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> ei kooskõlastanud {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
<i class="fa fa-exclamation-circle text-danger" aria-hidden="true" style="margin-right:3px;"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> ei kooskõlastanud {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
</div>
<div *ngIf="reply.entityType == 'ISSUE_EVENT' && reply.type == 'DECISION' && reply.resolutionType == classifiers.issue_resolution_type.DISMISSED.code" class="card-text ml-4">
<i class="fa fa-eye-slash text-muted" aria-hidden="true"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> jättis läbi vaatamata {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
<i class="fa fa-eye-slash text-muted" aria-hidden="true" style="margin-right:3px;"></i> <strong>{{ getOrganizationWithUser(reply) }}</strong> jättis läbi vaatamata {{ reply.dateCreated | datem:'YYYY-MM-DD HH:mm:ss'}}
</div>
</div>
<form class="col-12" #commentForm="ngForm" class="m-4">
......
<div class="alert alert-info" role="alert">
<h3 class="alert-heading">Palun logige sisse</h3>
<h3 class="alert-heading">Palun logi sisse</h3>
<p class="mb-0">{{loginBoxText}}
<a href="/oauth2/authorization/tara?fromUrl={{getCurrentUrl()}}">
{{loginLinkText}}
......
......@@ -41,7 +41,7 @@
<tbody>
<tr *ngFor="let doc of gridData.content">
<td class="name">
<app-file-icon [file]="doc"></app-file-icon>
<app-file-icon [file]="doc" style="margin-right:5px;"></app-file-icon>
<a *ngIf="canDownload(doc)"
href="{{ generalHelperService.getFileUrl(doc.url, system.details.short_name) }}" target="_blank">{{
(!doc.name || doc.name.trim()=='') ? generalHelperService.getFileUrl(doc.url) : doc.name }}</a>
......
......@@ -38,7 +38,7 @@
<app-alert *ngIf="closedIssues.length == 0" [conf]="{
type: 'info',
heading: 'Ühtegi suletud arutelu ei leidu',
text: 'Arutelusid algatada ja kommenteerida saavad vaid infosüsteemi kontaktid ning RIHA hindajad'
text: 'Arutelusid algatada ja kommenteerida saavad vaid asutuse kirjeldajad ning RIHA hindajad'
}"></app-alert>
<div class="my-1" *ngIf="closedIssues.length > 0">
<div class="table-responsive">
......
......@@ -41,7 +41,7 @@
<tbody>
<tr *ngFor="let legislation of gridData.content">
<td class="name">
<i class="fa fa-external-link text-primary"></i>
<i class="fa fa-external-link text-primary" style="margin-right:5px;"></i>
<a href="{{ legislation.url }}" target="_blank">{{ (!legislation.name || legislation.name.trim()=='') ? legislation.url : legislation.name }}</a>
</td>
<td class="type"><span *ngIf="legislation.type && classifiers.legislation_types[legislation.type]">{{classifiers.legislation_types[legislation.type].value}}</span></td>
......
......@@ -28,7 +28,7 @@
<table *ngIf="system.details.data_files && system.details.data_files.length > 0" class="details-list-table">
<tr *ngFor="let file of system.details.data_files">
<td>
<i class="fa fa-file-o text-primary"></i>
<app-file-icon [file]="file" style="margin-right:3px;"></app-file-icon>
</td>
<td>
<a href="{{ generalHelperService.getFileUrl(file.url, system.details.short_name) }}" target="_blank">{{ file.name }}</a>
......
......@@ -15,7 +15,7 @@
<div *ngIf="system.getSecurityStandard() == classifiers.security_standard.ISKE.code" class="form-group">
<label class="text-muted separated-text">ISKE turbetase:</label>
<p *ngIf="system.getSecurityLevel() && classifiers.security_level[system.getSecurityLevel()]">
<strong>{{classifiers.security_level[system.getSecurityLevel()].value}}</strong>
<strong style="margin-right:3px;">{{classifiers.security_level[system.getSecurityLevel()].value}}</strong>
<strong>({{ system.getSecurityClass() }})</strong>
</p>
</div>
......
......@@ -18,7 +18,7 @@
<div class="form-group">
<label for="dataFile" class="text-muted separated-text">Fail:</label>
<div></div>
<label class="btn btn-secondary input-file-label mb-0" for="dataFile">Vali fail</label>
<label class="btn btn-secondary input-file-label mb-0" style="margin-right:5px;" for="dataFile">Vali fail</label>
<input class="d-none" id="dataFile" name="dataFile" type="file" (change)="fileChange($event)">
<span *ngIf="docFile != null" claas="col-4">{{ docFile.name }}</span>
<i *ngIf="uploading" class="fa fa-spinner fa-spin fa-fw"></i>
......@@ -96,7 +96,7 @@
<div class="expandable-blocks">
<div class="expandable-block" *ngFor="let doc of documents; let i = index">
<div class="expandable-block-header" [ngClass]="{'highlighted': blocks[i]}">
<app-file-icon [file]="doc"></app-file-icon>
<app-file-icon [file]="doc" style="margin-right:5px;"></app-file-icon>
<a href="{{ generalHelperService.getFileUrl(doc.url, system.details.short_name) }}" target="_blank">{{ doc.name }}</a>
<app-file-hint [file]="doc"></app-file-hint>
<button (click)="deleteTechDoc(i)" class="btn btn-danger btn-sm pull-right"><i class="fa fa-fw fa-trash-o"></i></button>
......
......@@ -84,7 +84,7 @@
<table class="details-list-table">
<tr *ngFor="let file of data_files; let i = index">
<td>
<i class="fa fa-file-o text-primary"></i>
<app-file-icon [file]="file" style="margin-right:3px;"></app-file-icon>
</td>
<td>
<a href="{{ generalHelperService.getFileUrl(file.url, system.details.short_name) }}" target="_blank">{{ file.name }}</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment