Unverified Commit ff25eecc authored by Peter Stanko's avatar Peter Stanko
Browse files

Added description

parent 36e9a4b5

src/app/courses/course-create/course-create.component.html

+8 −0
Original line number Diff line number Diff line
@@ -22,6 +22,14 @@ 
        </div>

      </div>



      <div class="form-group row">

        <label for="description" class="col-lg-3 control-label">Description:</label>

        <div class="col-lg-8">

          <textarea id="description" formControlName="description" class="form-control" placeholder="Description">

          </textarea>

        </div>

      </div>



      <div class="form-group row">

        <button [attr.disabled]="(createData.status === 'VALID') ? null : true"

                class="btn btn-lg btn-primary btn-signin"

src/app/courses/course-create/course-create.component.ts

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ export class CourseCreateComponent implements OnInit, OnDestroy { 
    this.createData = this.fb.group({

      name: ['', Validators.required],

      codename: ['', Validators.required],

      description: [''],

    });

  }
@@ -41,7 +42,7 @@ export class CourseCreateComponent implements OnInit, OnDestroy { 
      return;

    }

    console.log('[CREATE] Course create form data: ', data);

    this.subscriptions.push(this.courseService.createCourse(data['name'], data['codename']).subscribe(

    this.subscriptions.push(this.courseService.createCourse(data['name'], data['codename'], data['description']).subscribe(

      () => {

        this.router.navigateByUrl('/courses').then(() => {

          this.flashMessagesService.show(`Created course ${data['codename']}.`, {cssClass: 'alert-success'});

src/app/courses/course-detail/course-detail.component.html

+11 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
    <h1>

      Course: {{course?.name}}

    </h1>

    <p>{{course?.description}}</p>

    <hr/>



    <div class="page-controls row">
@@ -24,11 +25,10 @@ 
  </div>







  <div class="col-md-9 page-body">

    <form [formGroup]="updateFormData">

      <div class="form-group row">

        <label class="col-lg-3 control-label">Name:</label>

        <label for="name" class="col-lg-3 control-label">Name:</label>

        <div class="col-lg-8">

          <input [attr.disabled]="(userCanUpdateCourse()) ? null : true"

                 type="text" id="name"
@@ -36,13 +36,21 @@ 
        </div>

      </div>

      <div class="form-group row">

        <label class="col-lg-3 control-label">Codename:</label>

        <label for="codename" class="col-lg-3 control-label">Codename:</label>

        <div class="col-lg-8">

          <input [attr.disabled]="(userCanUpdateCourse()) ? null : true" type="text" id="codename"

                 formControlName="codename" class="form-control" required>

        </div>

      </div>



      <div class="form-group row">

        <label for="description" class="col-lg-3 control-label">Description:</label>

        <div class="col-lg-8">

          <textarea [attr.disabled]="(userCanUpdateCourse()) ? null : true" id="description"

                    formControlName="description" class="form-control" placeholder="Description..."> </textarea>

        </div>

      </div>



      <div class="form-group row" *ngIf="(userCanUpdateCourse())">

        <label class="col-md-3 control-label"></label>

        <div class="col-md-8">

src/app/courses/course-detail/course-detail.component.ts

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ export class CourseDetailComponent implements OnInit, OnDestroy { 
    console.log('have course: ', this.course);

    this.updateFormData.setValue({

      name: this.course.name,

      codename: this.course.codename

      codename: this.course.codename,

      description: this.course.description,

    });

  }
@@ -59,6 +60,7 @@ export class CourseDetailComponent implements OnInit, OnDestroy { 
    this.updateFormData = this.fb.group({

      name: [ '', Validators.required ],

      codename: [ '', Validators.required ],

      description: [ '' ],

    });

  }
@@ -93,6 +95,7 @@ export class CourseDetailComponent implements OnInit, OnDestroy { 
      id: this.course.id,

      name: data[ 'name' ],

      codename: data[ 'codename' ],

      description: data[ 'description' ],

    } as Course;

    const updateCourseSubscription = this.service.updateCourse(newValues).subscribe(

      () => {

src/app/courses/groups/group-create/group-create.component.html

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,14 @@ 
        </div>

      </div>



      <div class="form-group row">

        <label for="description" class="col-lg-3 control-label">Description:</label>

        <div class="col-lg-8">

          <textarea id="description" formControlName="description" class="form-control" placeholder="Description">

          </textarea>

        </div>

      </div>



      <div class="form-group row">

        <div class="col-lg-3">

          <button [attr.disabled]="(createData.status === 'VALID') && userCanCreateGroup() ? null : true"
@@ -24,6 +32,7 @@ 
        </div>

      </div>





    </form>

  </div>

</div>