From af17365a9832c36049e80f99297a503bf37147ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cemal=20DEM=C4=B0R?= Date: Fri, 17 Apr 2020 10:42:05 +0300 Subject: [PATCH] =?UTF-8?q?Duyurular=20Widget=20S=C4=B1ralamas=C4=B1=20D?= =?UTF-8?q?=C3=BCzenlendi.=20Ana=20Sayfa=20Sa=C4=9Fl=C4=B1km=20Bakanl?= =?UTF-8?q?=C4=B1=C4=9F=C4=B1n=C4=B1n=20Videosu=20Yeniden=20D=C3=BCzenlend?= =?UTF-8?q?i.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SerikBelediyesiWebSayfasi/src/body.cpp | 52 ++++++------ SerikBelediyesiWebSayfasi/src/body.h | 49 +----------- SerikBelediyesiWebSayfasi/srcV2/mainpage.cpp | 84 ++++++-------------- mainapplication.cpp | 17 ++-- 4 files changed, 59 insertions(+), 143 deletions(-) diff --git a/SerikBelediyesiWebSayfasi/src/body.cpp b/SerikBelediyesiWebSayfasi/src/body.cpp index 8f513d1..28accab 100644 --- a/SerikBelediyesiWebSayfasi/src/body.cpp +++ b/SerikBelediyesiWebSayfasi/src/body.cpp @@ -699,11 +699,17 @@ void Body::Body::setAnnounceDetail(std::string oid) mMainContainer->clear(); mMainContainer->setContentAlignment(AlignmentFlag::Center); +// auto row1 = mMainContainer->addWidget(cpp14::make_unique()); +// row1->addStyleClass(Bootstrap::Grid::row); +// row1->setHeight (100); +// row1->setAttributeValue (Style::style,Style::background::color::color (" red ")); +// row1->setId ("row1"); + auto row = mMainContainer->addWidget(cpp14::make_unique()); row->addStyleClass(Bootstrap::Grid::row); - WText* announceTitle = nullptr;; + WText* announceTitle = nullptr; WText* AnnounceContent = nullptr; WText* LastDate = nullptr; WText* Department = nullptr; @@ -3405,17 +3411,10 @@ Body::NewsAnnounceContent::AnnouncePanel::AnnounceList::AnnounceList(mongocxx::d db(_db) { - // setAttributeValue(Style::style,Style::Border::border("3px solid red")); - - - auto mMainContainer = addWidget(cpp14::make_unique()); - mMainContainer->addStyleClass(Bootstrap::Grid::container_fluid); - mMainContainer->setContentAlignment(AlignmentFlag::Center); - { - auto container = mMainContainer->addWidget(cpp14::make_unique()); + auto container = addWidget(cpp14::make_unique()); container->addStyleClass(Bootstrap::Grid::row); - container->setMaximumSize(1024,WLength::Auto); + container->setMaximumSize(1280,WLength::Auto); container->setAttributeValue(Style::style,Style::background::color::color(Style::color::White::Azure)); { @@ -3437,24 +3436,20 @@ Body::NewsAnnounceContent::AnnouncePanel::AnnounceList::AnnounceList(mongocxx::d serik->setAttributeValue(Style::style,Style::font::size::s36px+Style::color::color(Style::color::White::AliceBlue)); } -// auto text = container->addWidget(cpp14::make_unique("Duyurular")); -// text->setAttributeValue(Style::style,Style::font::size::s20px); } - auto row = mMainContainer->addWidget(cpp14::make_unique()); + auto row = addWidget(cpp14::make_unique()); row->addStyleClass(Bootstrap::Grid::row); - row->setMaximumSize(1024,WLength::Auto); + row->setMaximumSize(1280,WLength::Auto); row->setAttributeValue(Style::style,Style::background::color::color(Style::color::White::Azure)); - row->addStyleClass("announceRow"); auto container = row->addWidget(cpp14::make_unique()); - container->addStyleClass("AnnounceListSliderCss"); Collection = db->collection(SBLDKeys::Duyurular::collection); @@ -3483,21 +3478,20 @@ Body::NewsAnnounceContent::AnnouncePanel::AnnounceList::AnnounceList(mongocxx::d try { auto cursor = Collection.find(filter.view(),findOption); - std::int64_t count = Collection.count(filter.view()); - - if( count > 5 ) - { - container->addStyleClass("AnnounceListSliderPlay"); - }else{ - container->addStyleClass("AnnounceListSliderPaused"); - } - for( auto doc : cursor ) { - auto item = container->addWidget(cpp14::make_unique(doc[SBLDKeys::Duyurular::oid].get_oid().value.to_string(),doc[SBLDKeys::Duyurular::title].get_utf8().value.to_string(), - doc[SBLDKeys::Duyurular::department].get_utf8().value.to_string())); - item->addStyleClass(Bootstrap::Grid::Large::col_lg_12); - item->_ClickItem.connect(this,&AnnounceList::_ClickItem); + { + auto item = container->addWidget(cpp14::make_unique(doc[SBLDKeys::Duyurular::oid].get_oid().value.to_string(),doc[SBLDKeys::Duyurular::title].get_utf8().value.to_string(), + doc[SBLDKeys::Duyurular::department].get_utf8().value.to_string())); + item->addStyleClass(Bootstrap::Grid::Large::col_lg_12); + item->_ClickItem.connect(this,&AnnounceList::_ClickItem); + } + { + auto item = container->addWidget(cpp14::make_unique(doc[SBLDKeys::Duyurular::oid].get_oid().value.to_string(),doc[SBLDKeys::Duyurular::title].get_utf8().value.to_string(), + doc[SBLDKeys::Duyurular::department].get_utf8().value.to_string())); + item->addStyleClass(Bootstrap::Grid::Large::col_lg_12); + item->_ClickItem.connect(this,&AnnounceList::_ClickItem); + } } } catch (mongocxx::exception &e) { diff --git a/SerikBelediyesiWebSayfasi/src/body.h b/SerikBelediyesiWebSayfasi/src/body.h index 4595a5f..45d307e 100644 --- a/SerikBelediyesiWebSayfasi/src/body.h +++ b/SerikBelediyesiWebSayfasi/src/body.h @@ -78,50 +78,6 @@ namespace Body { class Meclis; -// class DataBaseWidget : public WContainerWidget -// { -// mongocxx::database* db; -// public: -// DataBaseWidget(mongocxx::database* _db ) -// :db(_db) -// { -// Bucket = this->db->gridfs_bucket(); -// } - -// mongocxx::collection collection(std::string collection) const{ -// return this->db->collection(collection); -// } - -// mongocxx::gridfs::bucket bucket() const{ -// return Bucket; -// } - -// mongocxx::database* getDB(){ -// return this->db; -// } - -// inline int getRandom(int begin = 0 , int end = 255 ) -// { -// std::random_device rd; -// std::mt19937 mt(rd()); -// std::uniform_int_distribution dist(begin,end); -// return dist(mt); -// } - - -// void showMessage( std::string title , std::string msg , std::string btnText = "OK"); -// void showMessage( std::string title , std::string msg , bsoncxx::exception &e , Wt::Icon icon = Icon::Warning); -// void showMessage( std::string title , std::string msg , mongocxx::exception &e , Wt::Icon icon = Icon::Warning); - -// std::int64_t count(std::string collection , bsoncxx::document::view &filter ) ; -// std::int64_t count(std::string collection , const document &filter = document{} ) ; -// std::int64_t count(std::string collection , bsoncxx::document::value val ) ; - -// private: -// mongocxx::gridfs::bucket Bucket; - -// }; - class Body : public WContainerWidget { @@ -371,6 +327,7 @@ namespace Body { AnnouncePanel(mongocxx::database* _db); + class AnnounceList : public WContainerWidget { public: @@ -390,13 +347,11 @@ namespace Body { private: mongocxx::database* db; mongocxx::collection Collection; - void _ClickItem(std::string oid); - Signal mClickoid; + }; - }; class TaskList : public WContainerWidget { diff --git a/SerikBelediyesiWebSayfasi/srcV2/mainpage.cpp b/SerikBelediyesiWebSayfasi/srcV2/mainpage.cpp index 4516755..e6400c5 100644 --- a/SerikBelediyesiWebSayfasi/srcV2/mainpage.cpp +++ b/SerikBelediyesiWebSayfasi/srcV2/mainpage.cpp @@ -374,12 +374,6 @@ void MainPage::initAnounceList() mMainContainer->mGetOid().connect([=](std::string mOid){ initAnounceDetail(mOid); }); - // { - // auto list = anounceContainer->addWidget(cpp14::make_unique(this->getDB())); - // list->mGetOid().connect([=](std::string mOid){ - // _Announce.emit(mOid); - // }); - // } footer->removeStyleClass("footerStickAbsolute"); } @@ -395,7 +389,7 @@ void MainPage::initAnounceDetail( std::string mOid ) auto row = mMainContainer->addWidget(cpp14::make_unique()); row->addStyleClass(Bootstrap::Grid::row); - row->setMaximumSize(1024,WLength::Auto); + row->setMaximumSize(1280,WLength::Auto); WText* announceTitle = nullptr; WText* AnnounceContent = nullptr; @@ -422,7 +416,9 @@ void MainPage::initAnounceDetail( std::string mOid ) } auto list = row->addWidget(cpp14::make_unique(this->getDB())); - list->addStyleClass(Bootstrap::Grid::Large::col_lg_3+Bootstrap::Grid::Medium::col_md_3+Bootstrap::Grid::Small::col_sm_2+Bootstrap::Grid::ExtraSmall::col_xs_12); + list->addStyleClass(Bootstrap::Grid::Large::col_lg_4+Bootstrap::Grid::Medium::col_md_4+Bootstrap::Grid::Small::col_sm_3+Bootstrap::Grid::ExtraSmall::col_xs_12); + list->addStyleClass (Bootstrap::Grid::Hidden::hidden_sm+Bootstrap::Grid::Hidden::hidden_xs); + list->mGetOid().connect([=](std::string _mOid){ this->initAnounceDetail(_mOid); }); @@ -430,7 +426,7 @@ void MainPage::initAnounceDetail( std::string mOid ) auto container = row->addWidget(cpp14::make_unique()); - container->addStyleClass(Bootstrap::Grid::Large::col_lg_9+Bootstrap::Grid::Medium::col_md_9+Bootstrap::Grid::Small::col_sm_10+Bootstrap::Grid::ExtraSmall::col_xs_12); + container->addStyleClass(Bootstrap::Grid::Large::col_lg_8+Bootstrap::Grid::Medium::col_md_8+Bootstrap::Grid::Small::col_sm_12+Bootstrap::Grid::ExtraSmall::col_xs_12); container->setPadding(0,AllSides); @@ -476,11 +472,6 @@ void MainPage::initAnounceDetail( std::string mOid ) auto _container = container->addWidget(cpp14::make_unique()); _container->addStyleClass(Bootstrap::Grid::Large::col_lg_12); auto _layout = _container->setLayout(cpp14::make_unique()); -// auto back = _layout->addWidget(cpp14::make_unique("Ana Sayfa"),0,AlignmentFlag::Left); -// back->clicked().connect([=](){ -// this->_clickBack.emit(NoClass()); -// }); -// back->addStyleClass(Bootstrap::Button::Primary); auto textContainer = _layout->addWidget(cpp14::make_unique()); @@ -515,6 +506,26 @@ void MainPage::initAnounceDetail( std::string mOid ) Style::background::color::color(Style::color::Grey::Gainsboro)); } + { + auto _container = container->addWidget(cpp14::make_unique()); + _container->addStyleClass(Bootstrap::Grid::Large::col_lg_12); + _container->addStyleClass (Bootstrap::Grid::Hidden::hidden_lg+Bootstrap::Grid::Hidden::hidden_md); + _container->setAttributeValue(Style::style,Style::background::color::color(Style::color::Grey::Gainsboro)); + auto backList = _container->addWidget (cpp14::make_unique("Duyurular")); + backList->addStyleClass (Bootstrap::Button::Primary); + backList->clicked ().connect ([=](){ + mContentWidget->clear(); + + auto _mMainContainer = mContentWidget->addWidget(cpp14::make_unique(this->getDB())); + _mMainContainer->setPadding( 90 , Side::Top ); + _mMainContainer->setContentAlignment(AlignmentFlag::Center); + + _mMainContainer->mGetOid().connect([=](std::string mOid){ + initAnounceDetail(mOid); + }); + }); + } + } } catch (mongocxx::exception &e) { @@ -522,51 +533,6 @@ void MainPage::initAnounceDetail( std::string mOid ) return; } - - - - - -// if( !AnnounceList ) return; -// AnnounceList->mGetOid().connect([=](std::string oid){ -// auto filter = document{}; -// try { -// filter.append(kvp(SBLDKeys::Duyurular::oid,bsoncxx::oid{oid})); -// } catch (bsoncxx::exception &e) { -// return; -// } -// try { -// mongocxx::stdx::optional val = DuyurularCollection.find_one(filter.view()); -// if( !val ) -// { -// return; -// }else{ -// auto view = val.value().view(); -// if( announceTitle ) -// { -// announceTitle->setText(view[SBLDKeys::Duyurular::title].get_utf8().value.to_string().c_str()); -// } -// if( AnnounceContent ) -// { -// AnnounceContent->setText(view[SBLDKeys::Duyurular::html].get_utf8().value.to_string().c_str()); -// } - -// if( Department ) -// { -// Department->setText(""+view[SBLDKeys::Duyurular::department].get_utf8().value.to_string()+""); -// } - -// if( LastDate ) -// { -// LastDate->setText("Son Yayınlanma Tarihi:"+QDate::fromString(QString::number((int)view[SBLDKeys::Duyurular::endDate].get_double().value),"yyyyMMdd").toString("dddd dd/MM/yyyy").toStdString()); -// } - -// } -// } catch (mongocxx::exception &e) { -// return; -// } -// }); - } void MainPage::initBaskan() diff --git a/mainapplication.cpp b/mainapplication.cpp index 3f22510..dc2a80c 100644 --- a/mainapplication.cpp +++ b/mainapplication.cpp @@ -204,7 +204,7 @@ void MainApplication::init() container->setWidth(WLength("100%")); container->setHeight(WLength("100%")); container->setPositionScheme(PositionScheme::Fixed); - container->setAttributeValue(Style::style,Style::background::color::rgba(0,0,0)); + container->setAttributeValue(Style::style,Style::background::color::rgba(255,255,255,0.75)); container->setZIndex(1000); auto _container = container->addWidget(cpp14::make_unique()); @@ -220,14 +220,15 @@ void MainApplication::init() { _container->setContentAlignment (AlignmentFlag::Center); - _container->setPadding (25,Side::Top); + _container->setPadding (50,Side::Top); auto mContainer = _container->addWidget(cpp14::make_unique()); mContainer->setPositionScheme (PositionScheme::Relative); mContainer->setContentAlignment(AlignmentFlag::Center); - mContainer->setMaximumSize(1280,WLength::Auto); + mContainer->setMaximumSize(1024,WLength::Auto); mContainer->setHeight (512); + mContainer->addStyleClass ("boxShadow boxRadius"); { - auto link = ""; auto text = mContainer->addWidget(cpp14::make_unique(link,TextFormat::UnsafeXHTML)); text->setMaximumSize(1280,WLength::Auto); @@ -237,14 +238,14 @@ void MainApplication::init() auto skipContainer = mContainer->addWidget (cpp14::make_unique()); skipContainer->setPositionScheme (PositionScheme::Absolute); skipContainer->setOffsets (0,Side::Right|Side::Top); - skipContainer->setWidth (200); - skipContainer->setHeight (75); - skipContainer->setAttributeValue (Style::style,Style::background::color::color (Style::color::Red::DarkRed)); + skipContainer->setWidth (170); + skipContainer->setHeight (60); + skipContainer->setAttributeValue (Style::style,Style::background::color::color (Style::color::White::White)); skipContainer->decorationStyle ().setCursor (Cursor::PointingHand); auto layout = skipContainer->setLayout (cpp14::make_unique()); auto text = layout->addWidget (cpp14::make_unique("Ana SAYFA"),0,AlignmentFlag::Center|AlignmentFlag::Middle); - text->setAttributeValue (Style::style,Style::font::weight::bold+Style::font::size::s14px+Style::color::color (Style::color::White::Azure)); + text->setAttributeValue (Style::style,Style::font::weight::lighter+Style::font::size::s14px+Style::color::color (Style::color::Grey::Black)); skipContainer->clicked ().connect ([=](){ root()->removeWidget(container);