Commit 0fddc3ca authored by Ayush's avatar Ayush

Merge branch 'master' of https://git.cse.iitb.ac.in/ayushjangir/sfcode

Merge
parents 7d0c1029 07559b03
......@@ -26,9 +26,9 @@ if($result = $mysqli->query($sql2)){
$data[$i]['username'] = $row['username'];
$data[$i]['statement'] = $row['statement'];
$data[$i]['tc1'] = $row['tc1'];
$data[$i]['out1'] = $row['out1'];
$data[$i]['out1'] = "";
$data[$i]['tc2'] = $row['tc2'];
$data[$i]['out2'] = $row['out2'];
$data[$i]['out2'] = "";
$data[$i]['stime'] = $row['stime'];
$data[$i]['etime'] = $row['etime'];
$i++;
......
import {Component, OnInit} from '@angular/core';
import {ProblemService} from '../problem.service';
// import {ProblemService} from '../problem.service';
import { ApiService } from '../api.service';
import {Problem} from '../problem';
// import {Problem} from '../problem';
import { User } from '../user';
import { Question } from '../question';
import { QuestionService } from '../question.service';
......@@ -14,7 +14,7 @@ import { QuestionService } from '../question.service';
export class HomeComponent implements OnInit {
user: User;
problems: Problem[];
// problems: Problem[];
questiontoPost: Question = {
title: "",
username: "",
......@@ -32,14 +32,13 @@ export class HomeComponent implements OnInit {
errorMessage: any;
constructor(private dataService: ApiService,
private problemService: ProblemService,
private questionService: QuestionService) {
}
ngOnInit(): void {
this.user = JSON.parse(this.dataService.getToken());
this.questiontoPost.username = this.user.username;
this.getProblems();
// this.getProblems();
this.questionService.getQues()
.subscribe(data => {
......@@ -64,10 +63,10 @@ export class HomeComponent implements OnInit {
// console.log(this.ques_final);
}
getProblems(): void {
this.problemService.getProblems()
.subscribe(problems => this.problems = problems);
}
// getProblems(): void {
// this.problemService.getProblems()
// .subscribe(problems => this.problems = problems);
// }
openForm(): void {
document.getElementById('popupForm').style.display = 'block';
......
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