Complaints suggestions #49
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -162,6 +162,60 @@ export interface IUserTagCategory { | |
| tags: IUserTag[]; | ||
| } | ||
|
|
||
| export interface IComplaintTagUri { | ||
|
There was a problem hiding this comment. Change to |
||
| id: string; | ||
| tag_uri: string; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| export interface IComplaintComment { | ||
| id: string; | ||
| time: string; | ||
| text: string; | ||
| commented_by: IUserProfile; | ||
|
There was a problem hiding this comment.
|
||
| reported_date: string; | ||
| } | ||
|
|
||
| export interface IComplaint { | ||
| id: string; | ||
| created_by: IUserProfile; | ||
|
There was a problem hiding this comment.
|
||
| description: string; | ||
| suggestions: string; | ||
| location_details: string; | ||
| report_date: string; | ||
| reported_date: string; | ||
| status: string; | ||
| status_color: string; | ||
|
There was a problem hiding this comment.
|
||
| latitude: number; | ||
| longitude: number; | ||
| location_description: string; | ||
| tags: IComplaintTagUri; | ||
| users_up_voted: IUserProfile[]; | ||
| images: string[]; | ||
| comments: IComplaintComment[]; | ||
| vote_count: number; | ||
|
There was a problem hiding this comment.
|
||
| is_subscribed: number; | ||
| upvoted: boolean; | ||
| } | ||
|
|
||
| export interface IComplaintPost { | ||
| description: string; | ||
| suggestions: string; | ||
| location_details: string; | ||
| latitude: number; | ||
| longitude: number; | ||
| location_description: string; | ||
| tags: string[]; | ||
| images: string[]; | ||
| } | ||
|
|
||
| export interface IPostComment { | ||
| text: string; | ||
| } | ||
|
There was a problem hiding this comment. You don't need separate interfaces for posting. Reuse |
||
|
|
||
| export interface ICommentDialogData { | ||
| commentId: string; | ||
| comment: string; | ||
| } | ||
|
There was a problem hiding this comment. Just use the |
||
| export interface IInstituteRole { | ||
| id: string; | ||
| name: string; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| .complaint-card { | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| .complaint-divider { | ||
| padding: 1%; | ||
| } | ||
|
|
||
| .complaint-card-content { | ||
| font-size: medium; | ||
| padding-top: 3%; | ||
| } | ||
|
|
||
| .complaint-description { | ||
| white-space: pre-wrap; | ||
| } | ||
|
|
||
| .complaint-location-details { | ||
| padding-top: 2%; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| .card { | ||
| margin: 5%; | ||
| width: 80%; | ||
| } | ||
|
|
||
| .footer { | ||
| position: relative; | ||
| text-align: center; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| .footer-button-container { | ||
| display: inline; | ||
| } | ||
|
|
||
| .complaint-upvote-active { | ||
| color: #536dfe; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| .status { | ||
| float: right; | ||
| background-color: red; | ||
| border-width: medium; | ||
|
There was a problem hiding this comment.
|
||
| color: white; | ||
| padding: 0 2.5%; | ||
| font-weight: bold; | ||
| text-transform: uppercase; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
There was a problem hiding this comment. Same for all other files. You can configure most text editors to do this for you. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <div class="complaint-card" *ngFor="let complaint of complaintList; let i = index"> | ||
|
There was a problem hiding this comment.
|
||
| <mat-card class="card" [routerLink]="['/venter/detailed-complaint', complaint.id]"> | ||
| <div class="status" [style.backgroundColor]="complaint.status_color"> | ||
| {{ complaint.status }} | ||
| </div> | ||
| <mat-card-header> | ||
| <img mat-card-avatar src="{{complaint.created_by.profile_pic}}" | ||
| src-fallback="assets/add_image_placeholder.svg"> | ||
| <mat-card-title>{{ complaint.created_by.name }}</mat-card-title> | ||
| <mat-card-subtitle> | ||
| <div>{{ complaint.reported_date }}</div> | ||
| <div>{{ complaint.location_description }}</div> | ||
| </mat-card-subtitle> | ||
| </mat-card-header> | ||
| <span class="complaint-divider"> | ||
| <mat-divider></mat-divider> | ||
| </span> | ||
| <mat-card-content> | ||
| <div> | ||
| <div> | ||
| <div class="complaint-card-content"><b>Complaint:</b></div> | ||
| <pre><div class="complaint-description">{{ complaint.description }}</div></pre> | ||
| </div> | ||
| <div *ngIf="complaint.suggestions"> | ||
| <div class="complaint-card-content"><b>Suggestions:</b></div> | ||
| <div>{{ complaint.suggestions }}</div> | ||
| </div> | ||
| <div *ngIf="complaint.location_details"> | ||
| <div class="complaint-card-content"><b>Location Details:</b></div> | ||
| <div class="complaint-location-details">{{ complaint.location_details }}</div> | ||
| </div> | ||
| </div> | ||
| </mat-card-content> | ||
| <div class="complaint-divider"> | ||
| <mat-divider></mat-divider> | ||
| </div> | ||
| <mat-card-footer> | ||
| <div class="footer"> | ||
| <div class="footer-button-container"> | ||
| <div *ngIf="complaint.upvoted" class="complaint-upvote-active, footer-button-container"> | ||
| <button (click)="[upVoteComplaint(complaint.upvoted, complaint.id), onClickEvent($event)]" | ||
| class="complaint-upvote-active" mat-icon-button> | ||
| <mat-icon>arrow_upward</mat-icon>{{ complaint.users_up_voted.length }} | ||
| </button> | ||
| </div> | ||
| <div *ngIf="!complaint.upvoted" class="footer-button-container"> | ||
| <button (click)="[upVoteComplaint(complaint.upvoted, complaint.id), onClickEvent($event)]" | ||
| mat-icon-button> | ||
| <mat-icon>arrow_upward</mat-icon>{{ complaint.users_up_voted.length }} | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <button mat-icon-button class="footer-button-container"> | ||
| <mat-icon>insert_comment</mat-icon>{{ complaint.comments.length }} | ||
| </button> | ||
| <div class="footer-button-container"> | ||
| <div *ngIf="complaint.is_subscribed" class="footer-button-container"> | ||
| <button (click)="[subscribeToComplaint(complaint.complaint_subscribed), onClickEvent($event)]" | ||
| mat-icon-button> | ||
| <mat-icon>notifications_active</mat-icon> | ||
| </button> | ||
| </div> | ||
| <div *ngIf="!complaint.is_subscribed" class="footer-button-container"> | ||
| <button (click)="[subscribeToComplaint(complaint.complaint_subscribed), onClickEvent($event)]" | ||
| mat-icon-button> | ||
| <mat-icon>notifications</mat-icon> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </mat-card-footer> | ||
| </mat-card> | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import { Component, OnInit, Input } from '@angular/core'; | ||
| import { IComplaint } from '../../interfaces'; | ||
| import { DataService } from '../../data.service'; | ||
| import { API } from '../../../api'; | ||
| import { VenterDataService } from '../venter-data.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-complaint-card', | ||
| templateUrl: './complaint-card.component.html', | ||
| styleUrls: ['./complaint-card.component.css'] | ||
| }) | ||
| export class ComplaintCardComponent implements OnInit { | ||
|
|
||
| @Input() complaintList: IComplaint[]; | ||
| @Input() myComplaintsList: IComplaint[]; | ||
| constructor( | ||
| public dataService: DataService, | ||
| public venterDataService: VenterDataService, | ||
| ) { } | ||
|
|
||
| ngOnInit() { | ||
| } | ||
|
|
||
| refresh() { | ||
| /* Get all the complaints from server*/ | ||
| this.dataService.FireGET<IComplaint[]>(API.Complaints).subscribe(result => { | ||
| this.complaintList = result; | ||
| this.venterDataService.getComplaintInfo(this.complaintList); | ||
| }); | ||
| /* Get the current user complaints from server*/ | ||
| this.dataService.FireGET<IComplaint[]>(API.MyComplaints).subscribe(result => { | ||
| this.myComplaintsList = result; | ||
| this.venterDataService.getComplaintInfo(this.myComplaintsList); | ||
| }); | ||
| } | ||
|
|
||
| onClickEvent(event) { | ||
| event.stopPropagation(); | ||
| } | ||
|
|
||
| subscribeToComplaint(complaint_subscribed: number, complaintId: string) { | ||
| this.venterDataService.subscribeToComplaint(complaint_subscribed, complaintId); | ||
| this.refresh(); | ||
| } | ||
|
|
||
| upVoteComplaint(has_upvoted: boolean, complaintId: string) { | ||
| this.venterDataService.upVoteComplaint(has_upvoted, complaintId); | ||
| this.refresh(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.