Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into implement-AppBar-fo…
Browse files Browse the repository at this point in the history
…r-Phone-usage-#134
  • Loading branch information
saadnoor committed Jan 24, 2022
2 parents be29c0c + 3af8dab commit 94d2481
Show file tree
Hide file tree
Showing 20 changed files with 653 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class public ChileCompanyDashboardPanel extends BBjWidget
BBjAPI().setCustomEventCallback("ON_ACTION_ITEM_EDIT_PRESSED", #this!, "onEditPressed")
BBjAPI().setCustomEventCallback("ON_ACTION_ITEM_DELETE_PRESSED", #this!, "onDeletePressed")
FI
rem escape
methodend

method public void onHeaderMenuItemClick(BBjCustomEvent ev!)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ portal!.setProfile(login!.getProfile())
portal!.setUsername(login!.getUser())
portal!.setMenu(m!)
portal!.setHeaderMenu(headerMenu!)
portal!.setStartingPanel(500)
portal!.setLogoUrl("WebKit/demo/assets/chile-3.jpeg")
portal!.setLogoSmallUrl("WebKit/demo/assets/chile-3-small.jpeg")

Expand Down
4 changes: 2 additions & 2 deletions demo/ChileCompanyCustomerPortal/ChileCompanyMyDashboard.bbj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use ::WebKit/util/ClientUtil.bbj::ClientUtil
use ::BBjWidget/BBjWidget.bbj::BBjWidget

use ::WebKit/framework/PortalFrame/PortalFrame.bbj::PortalFrame
use ::WebKit/Util/Icons.bbj::Icons


class public ChileCompanyMyDashboard extends BBjWidget
Expand Down Expand Up @@ -29,12 +30,11 @@ class public ChileCompanyMyDashboard extends BBjWidget
canvas! = #getCanvas()
canvas!.addStyle("dashboardWindow")
canvas!.addPanelStyle("dashboardWindowPanel")
canvas!.addStaticText(100, 0, 0, 0, 0, "To be implemented!!")
canvas!.addStaticText(100, 0, 0, 0, 0, Icons.get("check","color:red"))
PortalFrame.getInstance().reloadAllPanels()

methodret
FI
rem escape

methodend
classend
10 changes: 7 additions & 3 deletions demo/Showcase/components/ShowCaseMenuPanel.bbj
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ use ::WebKit/widgets/DashboardTasks/DashboardTasks.bbj::DashboardTasks
use ::WebKit/demo/ChileCompanyCustomerPortal/ChileCompanyCustomerDashboardPanel.bbj::ChileCompanyDashboardPanel
use ::WebKit/util/ClientUtil.bbj::ClientUtil

use ::WebKit/widgets/MenuCard/MenuCard.bbj::MenuCard
use ::WebKit/model/Menu.bbj::MenuItem
class public ShowCaseMenuPanel extends TreeListPanel
field public DashboardHeader dashHeader!
field public DashboardTasks dashTasks!
field public ChileCompanyDashboardPanel chileDashBoard!


method public ShowCaseMenuPanel(BBjWindow wnd!)

Expand Down Expand Up @@ -46,9 +48,11 @@ class public ShowCaseMenuPanel extends TreeListPanel
methodend

method public void createThirdWidget(BBjWindow wnd!)
#chileDashBoard! = new ChileCompanyDashboardPanel(wnd!)
#chileDashBoard!.addStyle("chileDash")
declare MenuCard card!
card! = new MenuCard(wnd!)
card!.setMenuItem(new MenuItem(null(),104,"Fast Reseller","Fast Reseller",""))

card!.setLetterColor("#408458")
methodend


Expand Down
4 changes: 4 additions & 0 deletions framework/DialogPanel/DialogPanel.bbj
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ class public DialogPanel extends BBjWidget
#cancelBtnText$ = text!
#cancelBtn!.setText(#cancelBtnText$)
methodend

method public void setFooterVisible(Boolean value!)
#footer!.setVisible(value!)
methodend

rem @Override
method public void setText(String text!)
Expand Down
51 changes: 21 additions & 30 deletions framework/DialogPanel/DialogPanel.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,48 +20,39 @@

/* TODO adjust when in mini drawer form */
.dialogPanel{
position: fixed !important;
top: 10vh !important;
left: 35vw !important;
z-index: 1199 !important;
width: 750px;
height: 700px;
position: fixed;
height: 80vh;
margin: 5% auto;
left: 0;
right: 0;
z-index: 999 !important;
display: flex;
flex-direction: column;
max-width: 56rem;
min-width: 16rem;
background-color: white;
border-radius: 8px;
border-radius: var(--bbj-border-radius-m);
box-shadow: var(--bbj-shadow-l);
backdrop-filter: drop-shadow(2px 4px 6px black);
}

.bodyPanel{
padding: 30px;
height: 500px;
padding: 1rem;
height: 100%;
overflow-y: auto !important;
}


.headerWnd{
height: 60px;
padding: 10px;
}

.headerPanel{
display: grid;
grid-template-columns: 90% 10%;
}

.headerTitle{
margin-left: 25px;
font-size: 25px;
grid-column: 1;
}
.headerPanel {
display: flex;
justify-content: space-between;
align-items: center;
margin: 1.25rem 1rem;
font-size: 1.5em;
}

.closeIconWnd{
grid-column: 2;
align-self: center;
justify-self: center;

justify-self: end;
cursor: pointer;

}

.closeIcon{
Expand Down
77 changes: 77 additions & 0 deletions framework/MenuCardPanel/MenuCardPanel.bbj
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
use ::WebKit/framework/TreeListPanel/TreeListPanel.bbj::TreeListPanel
use ::WebKit/widgets/MenuCard/MenuCard.bbj::MenuCard
use ::WebKit/model/Menu.bbj::Menu
use ::WebKit/model/Menu.bbj::MenuItem
use ::WebKit/util/DynamicLoader.bbj::DynamicLoader


class public MenuCardPanel extends TreeListPanel

method public MenuCardPanel(BBjWindow wnd!)


DynamicLoader.addLocalCSS("WebKit/framework/MenuCardPanel/MenuCardPanel.css")
#super!.create(wnd!,wnd!.getAvailableControlID())
#setVisible(0)

methodend

rem @override
method public void redraw(Boolean e_init!)

if e_init! > 0 then
window! = #getCanvas()
window!.addPanelStyle("menupanel")
#createHeadLine(window!)
#createAdditionalTopPanel()
#MenuTilesBox! = #getCanvas().addChildWindow(window!.getAvailableControlID(),0,0,100,80,"",$00108800$,BBjAPI().getSysGui().getAvailableContext())
#MenuTilesBox!.addStyle("menuTilesBox")
#MenuTilesBox!.addStyle("menuCardBox")

#Headline!.addStyle("headline")

#colors!.add("#FFFFFF")
FI
methodend

rem @override
method public void setParentNode(BBjNumber nodeId)
#cleanup()
#parentNodeID = nodeId
declare MenuItem node!
declare MenuItem item!
node! = #Menu!.getItem(nodeId)
#Headline!.setText(node!.getCaption())

v! = node!.getChildren()
it! = v!.iterator()
while it!.hasNext()
item! = cast(MenuItem,it!.next())
id% = item!.getNodeId()
tile! = new MenuCard(#MenuTilesBox!, id%)
tile!.setMenuItem(item!)
tile!.setCallback(MenuCard.ON_FAVORITES_ADD,#this!,"setFavorite")
tile!.setCallback(MenuCard.ON_CARD_CLICK,#this!,"onMenuItemClick")
tile!.setLetterColor(str(#colors!.get(MOD(tile!.getID(),#colors!.size()))))
#MenuItemTiles!.put(item!.getNodeId(),tile!)
if item!.getIcon() <> "" AND item!.getIcon() <> null() then
tile!.setIcon(item!.getIcon())
endif
wend
methodend


rem @override
method public void onMenuItemClick(BBjCustomEvent ev!)

nodeId=num(str(ev!.getObject()))
item!=#Menu!.getItem(nodeId)
if item!.hasChildren() then
#setParentNode(nodeId)
else
#fireEvent(BBjAPI.ON_BUTTON_PUSH,ev!.getObject())
fi
methodend


classend
21 changes: 21 additions & 0 deletions framework/MenuCardPanel/MenuCardPanel.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.menuCardBox {
display: flex;
flex-wrap: wrap;
gap: 25px;
padding: 20px;
}

.headline {
font-family: Lato;
font-style: normal;
font-weight: bold;
font-size: 32px;
line-height: 38px;
margin: 20px;
}

.header {
width: 100%;
margin-bottom: 10px;
margin-top: 30px;
}
129 changes: 129 additions & 0 deletions framework/MenuCardPanel/MenuCardPanelSorted.bbj
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
use ::WebKit/framework/TreeListPanel/TreeListPanel.bbj::TreeListPanel
use ::WebKit/widgets/MenuCard/MenuCard.bbj::MenuCard
use ::WebKit/model/Menu.bbj::Menu
use ::WebKit/model/Menu.bbj::MenuItem
use ::WebKit/util/DynamicLoader.bbj::DynamicLoader


class public MenuCardPanelSorted extends TreeListPanel

method public MenuCardPanelSorted(BBjWindow wnd!)


DynamicLoader.addLocalCSS("WebKit/framework/MenuCardPanel/MenuCardPanel.css")
#super!.create(wnd!,wnd!.getAvailableControlID())
#setVisible(0)

methodend

rem @override
method public void redraw(Boolean e_init!)

if e_init! > 0 then
window! = #getCanvas()
window!.addPanelStyle("menupanel")
#createHeadLine(window!)
#createAdditionalTopPanel()
#MenuTilesBox! = #getCanvas().addChildWindow(window!.getAvailableControlID(),0,0,100,80,"",$00108800$,BBjAPI().getSysGui().getAvailableContext())
#MenuTilesBox!.addStyle("menuTilesBox")
#MenuTilesBox!.addStyle("menuCardBox")

#Headline!.addStyle("headline")

#colors!.add("#FFFFFF")
FI
methodend

rem @override
method public void setParentNode(BBjNumber nodeId)
#cleanup()
#parentNodeID = nodeId
declare MenuItem node!
node! = #Menu!.getItem(nodeId)
#setHeadlineText(node!.getCaption())
#buildChildren(nodeId,0)
methodend

rem @override
method public void buildChildren(BBjNumber nodeId,BBjNumber i)

declare MenuItem node!
declare MenuItem item!
declare BBjVector headers!
headers! = new BBjVector()
declare BBjVector children!
children! = new BBjVector()


node! = #Menu!.getItem(nodeId)
v! = node!.getChildren()
it! = v!.iterator()

while it!.hasNext()
item! = cast(MenuItem,it!.next())
if item!.hasChildren() then
headers!.add(item!)
else
children!.add(item!)
fi
wend

css! = ""
it! = children!.iterator()

while it!.hasNext()
item! = cast(MenuItem,it!.next())
id% = item!.getNodeId()
tile! = new MenuCard(#MenuTilesBox!, id%)
tile!.setMenuItem(item!)
tile!.setCallback(MenuCard.ON_CARD_CLICK,#this!,"onMenuItemClick")
tile!.setLetterColor(str(#colors!.get(MOD(tile!.getID(),#colors!.size()))))
tile!.setCallback(MenuCard.ON_FAVORITES_ADD,#this!,"setFavorite")
if item!.getIcon() <> "" AND item!.getIcon() <> null() then
tile!.setIcon(item!.getIcon())
endif
#MenuItemTiles!.put(item!.getNodeId(),tile!)

wend
it! = headers!.iterator()
while it!.hasNext()
item! = cast(MenuItem,it!.next())
id% = item!.getNodeId()

header! = #MenuTilesBox!.addStaticText(#MenuTilesBox!.getAvailableControlID(),0,0,0,0,item!.getCaption())
header!.addStyle("header")
subChildren! = item!.getChildren()
iterator! = subChildren!.iterator()
while iterator!.hasNext()
item! = cast(MenuItem,iterator!.next())
id% = item!.getNodeId()
tile! = new MenuCard(#MenuTilesBox!, id%)
tile!.setMenuItem(item!)
tile!.setCallback(MenuCard.ON_FAVORITES_ADD,#this!,"setFavorite")
tile!.setCallback(MenuCard.ON_CARD_CLICK,#this!,"onMenuItemClick")
tile!.setLetterColor(str(#colors!.get(MOD(tile!.getID(),#colors!.size()))))
if item!.getIcon() <> "" AND item!.getIcon() <> null() then
tile!.setIcon(item!.getIcon())
endif
#MenuItemTiles!.put(item!.getNodeId(),tile!)
wend
wend

methodend



rem @override
method public void onMenuItemClick(BBjCustomEvent ev!)

nodeId=num(str(ev!.getObject()))
item!=#Menu!.getItem(nodeId)
if item!.hasChildren() then
#setParentNode(nodeId)
else
#fireEvent(BBjAPI.ON_BUTTON_PUSH,ev!.getObject())
fi
methodend


classend
Loading

0 comments on commit 94d2481

Please sign in to comment.