Project

General

Profile

« Previous | Next » 

Revision 57808

Added by Konstantinos Triantafyllou almost 5 years ago

[MonitorDashboard]: Add description on category and subcategory

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/topic.component.html
98 98 
                             [class.uk-form-danger]="categoryFb.get('name').dirty && categoryFb.get('name').invalid"
99 99 
                             type="text">
100 100 
                    </div>
101 
                    <div class="uk-width-1-1">
102 
                      <label>Description</label>
103 
                      <textarea class="uk-textarea" formControlName="description"
104 
                                rows="3" type="text"></textarea>
105 
                    </div>
101 106 
                    <div dashboard-input [type]="'select'"
102 107 
                         [formInput]="categoryFb.get('isPublic')" [options]="indicatorUtils.isPublic"
103 108 
                         label="Privacy" class="uk-width-1-2">
......
156 161 
                                   [class.uk-form-danger]="subcategoryFb.get('name').dirty && subcategoryFb.get('name').invalid"
157 162 
                                   type="text">
158 163 
                          </div>
164 
                          <div class="uk-width-1-1">
165 
                            <label>Description</label>
166 
                            <textarea class="uk-textarea" formControlName="description"
167 
                                      rows="3" type="text"></textarea>
168 
                          </div>
159 169 
                          <div dashboard-input [type]="'select'"
160 170 
                               [formInput]="subcategoryFb.get('isPublic')" [options]="indicatorUtils.isPublic"
161 171 
                               label="Privacy" class="uk-width-1-2">
......
206 216 
                                 [class.uk-form-danger]="subcategoryFb.get('name').dirty && subcategoryFb.get('name').invalid"
207 217 
                                 type="text">
208 218 
                        </div>
219 
                        <div class="uk-width-1-1">
220 
                          <label>Description</label>
221 
                          <textarea class="uk-textarea" formControlName="description"
222 
                                    rows="3" type="text"></textarea>
223 
                        </div>
209 224 
                        <div dashboard-input [type]="'select'"
210 225 
                             [formInput]="subcategoryFb.get('isPublic')" [options]="indicatorUtils.isPublic"
211 226 
                             label="Privacy" class="uk-width-1-2">
......
256 271 
                           [class.uk-form-danger]="categoryFb.get('name').dirty && categoryFb.get('name').invalid"
257 272 
                           type="text">
258 273 
                  </div>
274 
                  <div class="uk-width-1-1">
275 
                    <label>Description</label>
276 
                    <textarea class="uk-textarea" formControlName="description"
277 
                              rows="3" type="text"></textarea>
278 
                  </div>
259 279 
                  <div dashboard-input [type]="'select'"
260 280 
                       [formInput]="categoryFb.get('isPublic')" [options]="indicatorUtils.isPublic"
261 281 
                       label="Privacy" class="uk-width-1-2">
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/topic.component.ts
163 163 
    this.categoryFb = this.fb.group({
164 164 
      _id: this.fb.control(category._id),
165 165 
      name: this.fb.control(category.name, Validators.required),
166 
      description: this.fb.control(category.description),
166 167 
      alias: this.fb.control(category.alias),
167 168 
      isActive: this.fb.control(category.isActive),
168 169 
      isPublic: this.fb.control(category.isPublic),
......
227 228 
    this.subcategoryFb = this.fb.group({
228 229 
      _id: this.fb.control(subCategory._id),
229 230 
      name: this.fb.control(subCategory.name, Validators.required),
231 
      description: this.fb.control(subCategory.description),
230 232 
      alias: this.fb.control(subCategory.alias),
231 233 
      isActive: this.fb.control(subCategory.isActive),
232 234 
      isPublic: this.fb.control(subCategory.isPublic),

Also available in: Unified diff