Skip to content

Commit

Permalink
feat: add ability to search history
Browse files Browse the repository at this point in the history
  • Loading branch information
@diegopvlk
diegopvlk committed Sep 12, 2024
1 parent a9c0c23 commit e67d480
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 18 deletions.
30 changes: 22 additions & 8 deletions data/ui/window.blp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ template $DosageWindow: Adw.ApplicationWindow {
content: Adw.ToolbarView {
[top]
Adw.HeaderBar headerBar {
[start]
ToggleButton buttonSearch {
icon-name: "edit-find-symbolic";
visible: false;
}

[start]
Adw.Spinner headerBarSpinner {
margin-start: 9;
Expand All @@ -32,16 +38,25 @@ template $DosageWindow: Adw.ApplicationWindow {
}

title-widget: Adw.ViewSwitcher {
stack: stack;
stack: viewStack;
policy: wide;
};
}

content: Adw.ViewStack stack {
[top]
SearchBar searchBar {
SearchEntry searchEntry {
search-delay: 125;
placeholder-text: _("Search…");
width-request: 276;
}
}

content: Adw.ViewStack viewStack {
vexpand: true;

Adw.ViewStackPage todayPage {
name: 'page1';
name: 'today-page';
title: _("Today");
icon-name: 'today-icn-symbolic';

Expand Down Expand Up @@ -115,11 +130,11 @@ template $DosageWindow: Adw.ApplicationWindow {
}

Adw.ViewStackPage historyPage {
name: 'page2';
name: 'history-page';
title: _("History");
icon-name: 'history-symbolic';

child: Overlay {
child: Overlay historyOverlay {
ScrolledWindow {
Adw.ClampScrollable {
ListView historyList {
Expand All @@ -138,14 +153,13 @@ template $DosageWindow: Adw.ApplicationWindow {
[overlay]
Adw.StatusPage emptyHistory {
icon-name: 'history-empty-symbolic';
title: _("Empty history");
visible: false;
}
};
}

Adw.ViewStackPage treatmentsPage {
name: 'page3';
name: 'treatments-page';
title: _("Treatments");
icon-name: 'treatments-symbolic';

Expand Down Expand Up @@ -201,7 +215,7 @@ template $DosageWindow: Adw.ApplicationWindow {

[bottom]
Adw.ViewSwitcherBar switcherBar {
stack: stack;
stack: viewStack;
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/historyFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ historyItemFactory.connect('setup', (factory, listItem) => {
deleteButton.connect('clicked', () => {
const item = listItem.get_item();
const listView = box.get_parent().get_parent();
const listStore = listView.get_model().get_model().get_model();
const listStore = listView.get_model().get_model().get_model().get_model();
let position = listItem.get_position();

removedItem = item;
Expand Down
105 changes: 96 additions & 9 deletions src/window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ export const DosageWindow = GObject.registerClass(
'skipBtn',
'entryBtn',
'unselectBtn',
'viewStack',
'buttonSearch',
'searchBar',
'searchEntry',
],
},
class DosageWindow extends Adw.ApplicationWindow {
Expand All @@ -79,7 +83,6 @@ export const DosageWindow = GObject.registerClass(
#start() {
const load = () => {
this._loadData();
this._setEmptyHistLabel();
this._updateCycleAndLastUp();
this._updateJsonFile('treatments', treatmentsLS);
this._loadToday();
Expand Down Expand Up @@ -278,16 +281,25 @@ export const DosageWindow = GObject.registerClass(

async _loadHistory(historyJson) {
try {
if (historyLS.get_n_items() === 0) {
if (!historyLS.get_item(0)) {
historyJson.history.forEach(med => {
historyLS.append(new MedicationObject({ obj: med }));
});

this.historyFilter = new Gtk.CustomFilter();

this.filterHistoryModel = new Gtk.FilterListModel({
model: historyLS,
filter: this.historyFilter,
});

this._setHistorySearch();

const sortedHistModelPromise = new Promise(resolve => {
setTimeout(() => {
resolve(
(this.sortedHistoryModel = new Gtk.SortListModel({
model: historyLS,
model: this.filterHistoryModel,
section_sorter: new HistorySectionSorter(),
sorter: new HistorySorter(),
})),
Expand All @@ -296,9 +308,12 @@ export const DosageWindow = GObject.registerClass(
});

sortedHistModelPromise.then(_ => {
this._historyList.model = new Gtk.NoSelection({
this.noSelectionModel = new Gtk.NoSelection({
model: this.sortedHistoryModel,
});

this._historyList.model = this.noSelectionModel;

this._headerBarSpinner.set_visible(false);
});

Expand All @@ -307,7 +322,23 @@ export const DosageWindow = GObject.registerClass(
this._historyList.set_header_factory(historyHeaderFactory);
this._historyList.set_factory(historyItemFactory);

const app = this.get_application();
this.showSearchAction = new Gio.SimpleAction({ name: 'showSearch' });
app.set_accels_for_action('app.showSearch', ['<primary>f']);
app.add_action(this.showSearchAction);

historyLS.connect('items-changed', (model, pos, removed, added) => {
if (!historyLS.get_item(0)) {
this._searchBar.search_mode_enabled = false;
this._setEmptyHistStatus();
app.remove_action('showSearch');
} else {
const histVisible = this._viewStack.get_visible_child_name() === 'history-page';
this._buttonSearch.sensitive = true;
this._buttonSearch.visible = histVisible;
app.add_action(this.showSearchAction);
}

if (flow.itemsChanged) return;

if (added && removed === 0) {
Expand Down Expand Up @@ -361,7 +392,59 @@ export const DosageWindow = GObject.registerClass(
console.error('Error loading history:', err);
}

this._setEmptyHistLabel();
this._setEmptyHistStatus();
}

_setHistorySearch() {
this._buttonSearch.connect('clicked', () => {
this._searchBar.search_mode_enabled = !this._searchBar.search_mode_enabled;
});

this._searchBar.connect('notify::search-mode-enabled', searchBar => {
this._buttonSearch.active = searchBar.search_mode_enabled;
});

this.filterHistoryModel.connect('items-changed', () => {
let noResults = !this.filterHistoryModel.get_item(0);
this._emptyHistory.visible = noResults ? true : false;
this._emptyHistory.title = noResults ? _('No results found') : _('Empty history');
});

this._searchEntry.connect('search-changed', () => {
const removeDiacritics = str => {
return str
.toLowerCase()
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '');
};

const query = removeDiacritics(this._searchEntry.text.trim());

if (!query) {
this.historyFilter.set_filter_func(null);
this._emptyHistory.visible = false;
this._historyList.scroll_to(0, null, null);
return;
}

this.historyFilter.set_filter_func(item => {
const itemName = removeDiacritics(item.obj.name);
return itemName.includes(query);
});
});

this._viewStack.connect('notify::visible-child', viewStack => {
const histVisible = viewStack.get_visible_child_name() === 'history-page';
this._buttonSearch.visible = histVisible;
this._searchBar.visible = histVisible;

if (histVisible) {
this.showSearchAction.connect('activate', () => {
this._searchBar.search_mode_enabled = true;
this._searchEntry.grab_focus();
});
}
});
}

_loadToday() {
Expand Down Expand Up @@ -969,17 +1052,21 @@ export const DosageWindow = GObject.registerClass(
if (lastUp < today) this.lastUpdate = new Date().toISOString();
}

_setEmptyHistLabel() {
if (historyLS.get_n_items() === 0) this._emptyHistory.set_visible(true);
else this._emptyHistory.set_visible(false);
_setEmptyHistStatus() {
if (!historyLS.get_item(0)) {
this._emptyHistory.title = _('Empty history');
this._emptyHistory.visible = true;
this._buttonSearch.sensitive = false;
this._searchBar.search_mode_enabled = false;
this.get_application().remove_action('showSearch');
}
}

_updateEverything(skipHistUp, notifAction) {
if (!skipHistUp) this._updateJsonFile('history', historyLS);
this._updateCycleAndLastUp();
this._updateJsonFile('treatments', treatmentsLS);
this._loadToday();
this._setEmptyHistLabel();
this._updateEntryBtn(false);
this._checkInventory(notifAction);
}
Expand Down

0 comments on commit e67d480

Please sign in to comment.