Commit 21f48a9d authored by laurent l's avatar laurent l

fix ios loans & holds views

parent 00646bf5
......@@ -542,15 +542,6 @@ export class LibraryController extends Controller {
holds.refresh()
}
let indicator = this._view.getViewById("activity-indicator");
if (!indicator || (undefined == indicator.animate))
return this;
indicator.animate({
opacity: (state == 'on' ? 1 : 0),
duration: 1000
});
return this;
}
}
......@@ -19,20 +19,20 @@
<ScrollView>
<StackLayout>
<StackLayout tap="{{ addAccountAction }}" >
<Label text="{{ '&#xf067; ' + L('add_account') }}" class="fa" />
<Label text="{{ '&#xf067; ' + L('add_account') }}" class="fa" />
</StackLayout>
<StackLayout tap="{{ openSettingsAction }}" >
<Label text="{{ '&#xf013; ' + L('settings') }}" class="fa" />
<Label text="{{ '&#xf013; ' + L('settings') }}" class="fa" />
</StackLayout>
<StackLayout tap="{{ showAboutAction }}" >
<Label text="{{ '&#xf059; ' + L('about') }}" class="fa" />
<Label text="{{ '&#xf059; ' + L('about') }}" class="fa" />
</StackLayout>
</StackLayout>
</ScrollView>
</StackLayout>
</nsDrawer:RadSideDrawer.drawerContent>
</ScrollView>
</StackLayout>
</nsDrawer:RadSideDrawer.drawerContent>
<nsDrawer:RadSideDrawer.mainContent>
<DockLayout>
......@@ -51,19 +51,20 @@
separatorColor="transparent">
<lv:RadListView.itemTemplate>
<StackLayout class="list-accounts">
<GridLayout columns="150, 50, *" rows="auto, auto, auto, auto" class="account">
<GridLayout columns="150, 50, *" rows="auto, auto, auto, auto" class="account">
<GridLayout columns="30, 35" rows="" col="2" row="0" horizontalAlignment="right" class="badges" onTap="{{ displayAccountInfoAction }}">
<Label text="&#xf0a3;" col="0" row="0" class="{{ 'badge' + (isPortalCertified ? ' badge-ok' : '')}}" />
<Label text="{{ isPortalSecure ? '&#xf023;' : '&#xf3c1;'}}" col="1" row="0" class="{{ 'badge' + (isPortalSecure ? ' badge-ok' : '')}}" />
</GridLayout>
<Label text="{{ '&#xf2c2; ' + label }}" colSpan="3" col="0" row="0" class="account-name" />
<Label text="{{ '&#xf2c2; ' + label }}" colSpan="3" col="0" row="0" class="account-name" />
<Label text="{{ portalLabel }}" colSpan="3" col="0" row="1" class="portal-label" />
<Label text="{{ L('loans') + ':' }}" col="0" row="2" class="key" />
<Label text="{{ numberOfLoans() }}" col="1" row="2" class="value count" />
<Label
text="{{ (daysToNextLoanAction() < 0 ? '&#xf274; ' : '&#xf06a; ') + formattedNextLoanAction }}"
col="2" row="2"
col="2"
row="2"
class="{{ 'info ' + (daysToNextLoanAction() < 0 ? '' : 'late') }}"
visibility="{{ formattedNextLoanAction ? 'visible' : 'collapsed' }}" />
......
......@@ -39,4 +39,6 @@
</lv:RadListView>
<Label visibility="{{ holds.length || busy == 'on' ? 'collapsed' : 'visible' }}" style="text-align: center; height: 100dip" text="{{ L('no_holds') }}"/>
<ActivityIndicator style="height:50dip; width:50dip" id="activity-indicator" col="0" row="0" busy="{{ busy == 'on' ? 'true' : 'false' }}" color="orange"/>
</GridLayout>
......@@ -19,34 +19,27 @@
<nsDrawer:RadSideDrawer id="sideDrawer" drawerLocation="Right" drawerTransition="PushTransition">
<nsDrawer:RadSideDrawer.drawerContent xmlns:nsDrawer="nativescript-pro-ui/sidedrawer">
<shared:sidedrawer />
</nsDrawer:RadSideDrawer.drawerContent>
<nsDrawer:RadSideDrawer.drawerContent xmlns:nsDrawer="nativescript-pro-ui/sidedrawer">
<shared:sidedrawer />
</nsDrawer:RadSideDrawer.drawerContent>
<nsDrawer:RadSideDrawer.mainContent>
<GridLayout rows="auto, *" stretchLastChild="true" >
<StackLayout col="0" row="0" rowSpan="2">
<TabView androidTabsPosition="bottom" xmlns:library="views/library"
col="0" row="1">
<TabView.items>
<TabViewItem title="{{ '&#xf02d; ' + L('loans') }}">
<TabViewItem.view>
<library:loans />
</TabViewItem.view>
</TabViewItem>
<TabViewItem title="{{ '&#xf08d; ' + L('holds') }}">
<TabViewItem.view>
<library:holds />
</TabViewItem.view>
</TabViewItem>
</TabView.items>
</TabView>
</StackLayout>
<ActivityIndicator style="opacity: 0;height:50dip; width:50dip" id="activity-indicator" col="0" row="0" busy="true"/>
</GridLayout>
<TabView androidTabsPosition="bottom" xmlns:library="views/library"
col="0" row="1">
<TabView.items>
<TabViewItem title="{{ '&#xf02d; ' + L('loans') }}">
<TabViewItem.view>
<library:loans />
</TabViewItem.view>
</TabViewItem>
<TabViewItem title="{{ '&#xf08d; ' + L('holds') }}">
<TabViewItem.view>
<library:holds />
</TabViewItem.view>
</TabViewItem>
</TabView.items>
</TabView>
</nsDrawer:RadSideDrawer.mainContent>
</nsDrawer:RadSideDrawer>
......
<GridLayout colums="auto" row="auto" xmlns:lv="nativescript-ui-listview">
<lv:RadListView col="0" row="0"
items="{{ loans }}"
id="loans"
......@@ -46,6 +44,6 @@
</StackLayout>
</lv:RadListView.itemTemplate>
</lv:RadListView>
<Label visibility="{{ loans.length || busy == 'on' ? 'collapsed' : 'visible' }}" style="text-align: center; height: 100dip" text="{{ L('no_loans') }}" col="0" row="0"/>
<ActivityIndicator style="height:50dip; width:50dip" id="activity-indicator" col="0" row="0" busy="{{ busy == 'on' ? 'true' : 'false' }}" color="orange"/>
</GridLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment