Commit dfc076ac authored by Kristyna Pekarkova's avatar Kristyna Pekarkova
Browse files

Fixed some style bugs

parent 9f791aaa

src/app/review/shared/generic-editor/generic-editor.component.ts

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ export class GenericEditorComponent implements OnInit, AfterViewInit, OnDestroy 
        glyphMargin: true,

        automaticLayout: true

      });

      if (this.component === 'outputs') {

      if (this.component === 'results') {

        this.service.outputFilePathSent$.subscribe(data => {

          this.path = data['path'];

          const content = data['content'];
@@ -55,7 +55,7 @@ export class GenericEditorComponent implements OnInit, AfterViewInit, OnDestroy 
          this.setLanguage(this.path);

        });

      }

      if (this.component === 'tests') {

      if (this.component === 'test_files') {

        this.service.testFilePathSent$.subscribe(data => {

          this.path = data['path'];

          const content = data['content'];
@@ -63,7 +63,7 @@ export class GenericEditorComponent implements OnInit, AfterViewInit, OnDestroy 
          this.setLanguage(this.path);

        });

      }

      if (this.component === 'submission') {

      if (this.component === 'sources') {

        this.service.submissionFilePathSent$.subscribe(data => {

          this.path = data['path'];

          const content = data['content'];

src/app/review/submission-sources/review-list/review-list.component.html

+8 −6
Original line number Diff line number Diff line
@@ -92,18 +92,20 @@ 
                File: {{ item['review']?.file }} | First line: {{ item['review']?.line_start }} | Last line: {{ item['review']?.line_end}}

              </span>

              <span style="float: right">

                <span class="mr-3">

                  <input *ngIf="canEditReview(item['review'])" type="checkbox" class="form-check-input" id="exampleCheck1" (change)="addToSelectedReviews(item['review'])">

                  <label class="form-check-label" for="exampleCheck1">Export</label>

                </span>

                <i class="fas fa-history mr-3" title="View history" data-toggle="modal" data-target="#historyReviewModal" (click)="selected = item"></i>

                <i *ngIf="canEditReview(item['review'])" class="fas fa-pencil-alt mr-3" title="Edit review" data-toggle="modal" data-target="#editReviewModal" (click)="initEditReviewFormValue(item['review']); selected = item"></i>

                <i *ngIf="canDeleteReview(item['review'])" class="fas fa-times mr-3" title="Delete review" data-toggle="modal" data-target="#deleteReviewModal" (click)="selected = item"></i>

                <input *ngIf="canEditReview(item['review'])" type="checkbox" class="form-check-input" id="exampleCheck1" (change)="addToSelectedReviews(item['review'])">

                <label class="form-check-label" for="exampleCheck1">Select for export</label>

                <i *ngIf="canDeleteReview(item['review'])" class="fas fa-times" title="Delete review" data-toggle="modal" data-target="#deleteReviewModal" (click)="selected = item"></i>

             </span>

            </div>

            <span style="font-weight: bold">{{item['review']?.user?.name}}</span>

          </div>

          <p class="card-text">

            {{item['review']?.content}}

          </p>

          <div class="card-text">

            <pre>{{item['review']?.content}}</pre>

          </div>

          <h6 class="card-subtitle mt-1 text-muted"><span style="font-size: small"> {{item['review']?.created_at | date: 'dd.MM.yyyy HH:mm:ss'}} | <span>edited</span> (last edit: {{item['review']?.updated_at | date: 'dd.MM.yyyy HH:mm:ss'}})</span></h6>

        </div>

      </div>

src/app/review/submission-sources/submission-sources.component.html

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
      <app-generic-tree-view *ngIf="sourcesTree" [treeView]="sourcesTree" [component]="'sources'"></app-generic-tree-view>

    </div>

    <div class="col-sm pt-3 pl-0 pr-1" id="editor-column">

      <app-generic-editor [component]="'submission'"></app-generic-editor>

      <app-generic-editor [component]="'sources'"></app-generic-editor>

    </div>

    <div class="col-sm pt-3" id="reviews-column">

      <app-review-list *ngIf="sourcesTree && submission" [review]="review" [submission]="submission" [tree]="sourcesTree"></app-review-list>

src/app/review/submission-tests/test-outputs/test-outputs.component.html

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
      <app-generic-tree-view *ngIf="testOutputsTree" [treeView]="testOutputsTree" [component]="'results'"></app-generic-tree-view>

    </div>

    <div class="col-sm p-0" id="editor-column">

      <app-generic-editor [component]="'outputs'"></app-generic-editor>

      <app-generic-editor [component]="'results'"></app-generic-editor>

    </div>

  </div>

</div>

src/app/review/submission-tests/test-outputs/test-outputs.component.ts

+0 −1
Original line number Diff line number Diff line 
import {Component, Input, OnInit} from '@angular/core';

import * as monaco from 'monaco-editor';

import {TestService} from '../../services/test.service';

import {SubmissionService} from '../../../services/submission.service';

import {Submission, User} from '../../../shared/models/models';