GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

Merge pull request #1367 from crazyserver/MOBILE-2430

Browse Source 
Mobile 2430
This commit is contained in:
Juan Leyva 2018-06-22 08:40:27 +02:00 committed by GitHub
commit c1ea233092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/addon/mod/data/classes/field-plugin-component.ts
View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { Input, OnInit, OnChanges, SimpleChange } from '@angular/core';
import { Input, Output, OnInit, OnChanges, SimpleChange, EventEmitter } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
/**
@ -23,11 +23,13 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
@Input() value?: any; // The value of the field.
@Input() database?: any; // Database object.
@Input() error?: string; // Error when editing.
@Input() viewAction?: string; // Action to perform.
@Output() gotoEntry?: EventEmitter<number>; // Action to perform.
@Input() form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
@Input() search?: any; // The search value of all fields.
constructor(protected fb: FormBuilder) { }
constructor(protected fb: FormBuilder) {
this.gotoEntry = new EventEmitter();
}
/**
* Add the form control for the search mode.

4
src/addon/mod/data/components/action/addon-mod-data-action.html
View File

@ -28,7 +28,7 @@
<span *ngIf="action == 'timemodified'">{{ entry.timemodified * 1000 | coreFormatDate:"dffulldate" }}</span>
<a *ngIf="action == 'userpicture'" core-user-link [courseId]="database.courseid" [userId]="entry.userid" [title]="entry.fullname">
<img class="avatar-round" [src]="userPicture" [alt]="'core.pictureof' | translate:{$a: user.fullname}" core-external-content onError="this.src='assets/img/user-avatar.png'" role="presentation">
<img class="avatar-round" [src]="userPicture" [alt]="'core.pictureof' | translate:{$a: entry.fullname}" core-external-content onError="this.src='assets/img/user-avatar.png'" role="presentation">
</a>
<a *ngIf="action == 'user'" core-user-link [courseId]="database.courseid" [userId]="entry.userid" [title]="entry.fullname">{{entry.fullname}}</a>
<a *ngIf="action == 'user' && entry" core-user-link [courseId]="database.courseid" [userId]="entry.userid" [title]="entry.fullname">{{entry.fullname}}</a>

7
src/addon/mod/data/components/field-plugin/field-plugin.ts
View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { Component, Input, OnInit, Injector, ViewChild, OnChanges, SimpleChange } from '@angular/core';
import { Component, Input, Output, OnInit, Injector, ViewChild, OnChanges, SimpleChange, EventEmitter } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { AddonModDataProvider } from '../../providers/data';
import { AddonModDataFieldsDelegate } from '../../providers/fields-delegate';
@ -32,7 +32,7 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
@Input() value?: any; // The value of the field.
@Input() database?: any; // Database object.
@Input() error?: string; // Error when editing.
@Input() viewAction: string; // Action to perform.
@Output() gotoEntry: EventEmitter<number>; // Action to perform.
@Input() form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
@Input() search?: any; // The search value of all fields.
@ -42,6 +42,7 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
constructor(protected injector: Injector, protected dataDelegate: AddonModDataFieldsDelegate,
protected dataProvider: AddonModDataProvider) {
this.gotoEntry = new EventEmitter();
}
/**
@ -66,7 +67,7 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
value: this.value,
database: this.database,
error: this.error,
viewAction: this.viewAction,
gotoEntry: this.gotoEntry,
form: this.form,
search: this.search
};

3
src/addon/mod/data/components/index/index.ts
View File

@ -329,7 +329,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
this.jsData = {
fields: this.fields,
entries: this.entries,
data: this.data
data: this.data,
gotoEntry: this.gotoEntry.bind(this)
};
});
} else if (!this.search.searching) {

4
src/addon/mod/data/fields/picture/component/addon-mod-data-field-picture.html
View File

@ -11,6 +11,6 @@
<ion-input type="text" [formControlName]="'f_'+field.id" [placeholder]="field.name"></ion-input>
</span>
<span *ngIf="mode == 'list' && imageUrl" (click)="viewAction()"><img [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" core-external-content/></span>
<span *ngIf="mode == 'list' && imageUrl" (click)="gotoEntry.emit(entryId)"><img [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" core-external-content/></span>
<img *ngIf="mode == 'show' && imageUrl" [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" [width]="width" [height]="height" core-external-content/>
<img *ngIf="mode == 'show' && imageUrl" [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" [attr.width]="width" [attr.height]="height" core-external-content/>

10
src/addon/mod/data/fields/picture/component/picture.ts
View File

@ -13,8 +13,9 @@
// limitations under the License.
import { Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
import { CoreFileSessionProvider } from '@providers/file-session';
import { CoreDomUtilsProvider } from '@providers/utils/dom';
import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
import { AddonModDataProvider } from '../../../providers/data';
/**
@ -38,7 +39,8 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
width: string;
height: string;
constructor(protected fb: FormBuilder, private fileSessionprovider: CoreFileSessionProvider) {
constructor(protected fb: FormBuilder, private fileSessionprovider: CoreFileSessionProvider,
private domUtils: CoreDomUtilsProvider) {
super(fb);
}
@ -129,8 +131,8 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
this.imageUrl = (this.image && this.image.fileurl) || null;
}
}
this.width = this.field.param1 || '';
this.height = this.field.param2 || '';
this.width = this.domUtils.formatPixelsSize(this.field.param1);
this.height = this.domUtils.formatPixelsSize(this.field.param2);
}
}
}

4
src/addon/mod/data/pages/edit/edit.html
View File

@ -2,8 +2,8 @@
<ion-navbar>
<ion-title><core-format-text [text]="title"></core-format-text></ion-title>
<ion-buttons end>
<button ion-button icon-only (click)="save()" [attr.aria-label]="'core.save' | translate">
<ion-icon name="send"></ion-icon>
<button ion-button clear (click)="save()" [attr.aria-label]="'core.save' | translate">
{{ 'core.save' | translate }}
</button>
</ion-buttons>
</ion-navbar>

2
src/addon/mod/data/pages/edit/edit.ts
View File

@ -253,12 +253,14 @@ export class AddonModDataEditPage {
});
} else {
this.errors = {};
if (result.fieldnotifications) {
result.fieldnotifications.forEach((fieldNotif) => {
const field = this.fieldsArray.find((field) => field.name == fieldNotif.fieldname);
if (field) {
this.errors[field.id] = fieldNotif.notification;
}
});
}
this.jsData['errors'] = this.errors;
setTimeout(() => {

7
src/addon/mod/data/providers/data.ts
View File

@ -62,7 +62,7 @@ export class AddonModDataProvider {
.then((entry) => {
return {
// Return provissional entry Id.
newentryid: entry[1]
newentryid: entry
};
});
};
@ -194,8 +194,9 @@ export class AddonModDataProvider {
});
// App is offline, check required fields.
fields.forEach((field) => {
const notification = this.fieldsDelegate.getFieldsNotifications(field, contentsIndexed[field.id]);
Object.keys(fields).forEach((key) => {
const field = fields[key],
notification = this.fieldsDelegate.getFieldsNotifications(field, contentsIndexed[field.id]);
if (notification) {
notifications.push({
fieldname: field.name,

2
src/addon/mod/data/providers/helper.ts
View File

@ -119,7 +119,7 @@ export class AddonModDataHelperProvider {
// Replace field by a generic directive.
render = '<addon-mod-data-field-plugin [field]="fields[' + field.id + ']" [value]="entries[' + entry.id +
'].contents[' + field.id + ']" mode="' + mode + '" [database]="data" (viewAction)="gotoEntry(' + entry.id +
'].contents[' + field.id + ']" mode="' + mode + '" [database]="data" (gotoEntry)="gotoEntry(' + entry.id +
')"></addon-mod-data-field-plugin>';
template = template.replace(replace, render);
});

24
src/components/rich-text-editor/rich-text-editor.ts
View File

@ -46,6 +46,7 @@ import { Subscription } from 'rxjs';
export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy {
// Based on: https://github.com/judgewest2000/Ionic3RichText/
// @todo: Anchor button, fullscreen...
// @todo: Textarea height is not being updated when editor is resized. Height is calculated if any css is changed.
@Input() placeholder = ''; // Placeholder to set in textarea.
@Input() control: FormControl; // Form control.
@ -154,14 +155,21 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
*/
protected maximizeEditorSize(): Promise<number> {
this.content.resize();
const contentVisibleHeight = this.content.contentHeight;
const deferred = this.utils.promiseDefer();
setTimeout(() => {
const contentVisibleHeight = this.content.contentHeight;
if (contentVisibleHeight <= 0) {
deferred.resolve(0);
return;
}
setTimeout(() => {
// Editor is ready, adjust Height if needed.
if (contentVisibleHeight > 0) {
const height = this.getSurroundingHeight(this.element);
if (contentVisibleHeight > height) {
this.element.style.height = this.domUtils.formatPixelsSize(contentVisibleHeight - height);
@ -170,11 +178,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
}
deferred.resolve(contentVisibleHeight - height);
return;
}
deferred.resolve(0);
}, 100);
});
return deferred.promise;
@ -206,6 +210,13 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
height += this.domUtils.getComputedStyleMeasure(cs, 'paddingTop') +
this.domUtils.getComputedStyleMeasure(cs, 'paddingBottom');
if (element && element.parentNode && element.parentNode.tagName == 'ION-CONTENT') {
const cs2 = getComputedStyle(element);
height -= this.domUtils.getComputedStyleMeasure(cs2, 'paddingTop') +
this.domUtils.getComputedStyleMeasure(cs2, 'paddingBottom');
}
return height;
}
@ -487,7 +498,6 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
*/
ngOnDestroy(): void {
this.valueChangeSubscription && this.valueChangeSubscription.unsubscribe();
this.keyboardObs && this.keyboardObs.off();
window.removeEventListener('resize', this.resizeFunction);
}
}

6
src/core/mainmenu/pages/menu/menu.scss
View File

@ -7,4 +7,10 @@ page-core-mainmenu {
@extend .fa-graduation-cap;
@extend .fa;
}
.ion-ios-fa-graduation-cap-outline {
color: transparent;
-webkit-text-stroke-width: 0.8px;
-webkit-text-stroke-color: $tabs-tab-color-inactive;
}
}