self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-12 22:57:38 +02:00
Code Issues Releases Activity

Mobile: Added status info to view active alarms

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-28 20:31:14 +00:00
parent ddb73c8642
commit d1a83d065a
6 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReactNativeClient/lib/services/report.js
View File

@ -1,5 +1,6 @@
const { time } = require('lib/time-utils');
const { BaseItem } = require('lib/models/base-item.js');
const Alarm = require('lib/models/Alarm');
const { Folder } = require('lib/models/folder.js');
const { Note } = require('lib/models/note.js');
const { _ } = require('lib/locale.js');
@ -108,10 +109,8 @@ class ReportService {
async status(syncTarget) {
let r = await this.syncStatus(syncTarget);
let sections = [];
let section = {};
section.title = _('Sync status (synced items / total items)');
section.body = [];
let section = { title: _('Sync status (synced items / total items)'), body: [] };
for (let n in r.items) {
if (!r.items.hasOwnProperty(n)) continue;
@ -125,22 +124,31 @@ class ReportService {
sections.push(section);
section = {};
section.title = _('Folders');
section.body = [];
section = { title: _('Folders'), body: [] };
let folders = await Folder.all({
const folders = await Folder.all({
order: { by: 'title', dir: 'ASC' },
caseInsensitive: true,
});
for (let i = 0; i < folders.length; i++) {
let folder = folders[i];
const folder = folders[i];
section.body.push(_('%s: %d notes', folders[i].title, await Folder.noteCount(folders[i].id)));
}
sections.push(section);
section = { title: _('Coming alarms'), body: [] };
const alarms = await Alarm.allDue();
for (let i = 0; i < alarms.length; i++) {
const alarm = alarms[i];
const note = await Note.load(alarm.note_id);
section.body.push(_('On %s: %s', time.formatMsToLocal(alarm.trigger_time), note.title));
}
sections.push(section);
return sections;
}