Son Değişiklikler Yapıldı.

CMLDMR · Apr 19, 2019 · d9e3a19 · d9e3a19
1 parent 47b4443
commit d9e3a19
Show file tree

Hide file tree

Showing 15 changed files with 376 additions and 102 deletions.
diff --git a/SerikBelediyesiWebSayfasi.pro b/SerikBelediyesiWebSayfasi.pro
@@ -40,7 +40,8 @@ SOURCES += main.cpp \
     SerikBelediyesiWebSayfasi/srcV2/mainpage.cpp \
     SerikBelediyesiWebSayfasi/srcV2/headerpage.cpp \
     SerikBelediyesiWebSayfasi/srcV2/slider.cpp \
-    SerikBelediyesiWebSayfasi/srcV2/mainpagecontroller.cpp
+    SerikBelediyesiWebSayfasi/srcV2/mainpagecontroller.cpp \
+    SerikBelediyesiWebSayfasi/srcV2/baskanwidget.cpp
 
 
 
@@ -86,14 +87,16 @@ HEADERS += \
     SerikBelediyesiWebSayfasi/srcV2/mainpage.h \
     SerikBelediyesiWebSayfasi/srcV2/headerpage.h \
     SerikBelediyesiWebSayfasi/srcV2/slider.h \
-    SerikBelediyesiWebSayfasi/srcV2/mainpagecontroller.h
+    SerikBelediyesiWebSayfasi/srcV2/mainpagecontroller.h \
+    SerikBelediyesiWebSayfasi/srcV2/baskanwidget.h
 
 DISTFILES += \
     ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/css/mainPage.css \
     ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/css/slider.css \
     ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/css/eventWidget.css \
     ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/css/header.css \
-    ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/script/Script.js
+    ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/script/Script.js \
+    ../build-SerikBelediyesiWebSayfasi-Desktop_Qt_5_9_1_MSVC2015_64bit2-Release/docroot/script/testscript.js
 
 
 

diff --git a/SerikBelediyesiWebSayfasi.pro.user b/SerikBelediyesiWebSayfasi.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.8.2, 2019-04-17T08:46:02. -->
+<!-- Written by QtCreator 4.8.2, 2019-04-19T10:02:55. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -189,7 +189,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/project/Yonetim-yazilimi/SerikBelediyesiWebSayfasi/SerikBelediyesiWebSayfasi/SerikBelediyesiWebSayfasi.pro</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">SerikBelediyesiWebSayfasi.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments">--docroot docroot --http-address 192.168.0.31 --http-port 8085 --approot approot</value>
+    <value type="QString" key="RunConfiguration.Arguments">--docroot docroot --http-address 192.168.0.31 --http-port 8085 --approot approot --deploy-path &quot;/&quot;</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>

diff --git a/SerikBelediyesiWebSayfasi/src/body.cpp b/SerikBelediyesiWebSayfasi/src/body.cpp
@@ -3403,11 +3403,32 @@ Body::NewsAnnounceContent::AnnouncePanel::AnnounceList::AnnounceList(mongocxx::d
         container->setMaximumSize(1024,WLength::Auto);
         container->setAttributeValue(Style::style,Style::background::color::color(Style::color::White::Azure));
 
-        auto text = container->addWidget(cpp14::make_unique<WText>("Duyurular"));
-        text->setAttributeValue(Style::style,Style::font::size::s20px);
+        {
+            std::string path = "img/baskanBackGround.JPG";
+
+            auto img = container->addWidget(cpp14::make_unique<WContainerWidget>());
+            img->addStyleClass(Bootstrap::Grid::Large::col_lg_12);
+
+            img->setAttributeValue(Style::style,Style::background::url(path)+Style::background::size::cover+Style::background::repeat::norepeat+Style::background::position::center_center);
+            img->setHeight(100);
+            img->setPadding(0,AllSides);
+
+            auto gradientContainer = img->addWidget(cpp14::make_unique<WContainerWidget>());
+            gradientContainer->setHeight(100);
+            gradientContainer->addStyleClass("SliderDetailTextBackground");
+            auto layout = gradientContainer->setLayout(cpp14::make_unique<WVBoxLayout>());
+            layout->addStretch(1);
+            auto serik = layout->addWidget(cpp14::make_unique<WText>("Duyurular"),0,AlignmentFlag::Bottom|AlignmentFlag::Center);
+            serik->setAttributeValue(Style::style,Style::font::size::s36px+Style::color::color(Style::color::White::AliceBlue));
+        }
+
+//        auto text = container->addWidget(cpp14::make_unique<WText>("Duyurular"));
+//        text->setAttributeValue(Style::style,Style::font::size::s20px);
     }
 
 
+
+
     auto row = mMainContainer->addWidget(cpp14::make_unique<WContainerWidget>());
     row->addStyleClass(Bootstrap::Grid::row);
     row->setMaximumSize(1024,WLength::Auto);
@@ -3501,7 +3522,6 @@ Body::NewsAnnounceContent::AnnouncePanel::AnnounceList::AnnounceItem::AnnounceIt
         str.append("...");
     }
 
-
     layout->addWidget(cpp14::make_unique<WText>(str.toStdString()));
 
     setAttributeValue(Style::style,Style::Border::bottom::border("1px solid gray")+Style::Border::top::border("1px solid gray")+
@@ -6099,7 +6119,8 @@ void Body::Haber::setNews(std::string oid)
                 auto title = layout->addWidget(cpp14::make_unique<WText>(view[SBLDKeys::Haberler::Baslik].get_utf8().value.to_string().c_str()),0,AlignmentFlag::Bottom|AlignmentFlag::Center);
                 title->setAttributeValue(Style::style,Style::font::size::s36px+Style::color::color(Style::color::White::AliceBlue));
                 title->addStyleClass("NewsMainTitle");
-                wApp->setInternalPath("/"+title->text().toUTF8(),false);
+//                wApp->setTitle(view["Başlık"].get_utf8().value.to_string());
+//                wApp->setInternalPath("?oid="+view["_id"].get_oid().value.to_string()+"&type=news",false);
             }
 
             {
@@ -6117,6 +6138,12 @@ void Body::Haber::setNews(std::string oid)
                 auto _layout = _container->setLayout(cpp14::make_unique<WHBoxLayout>());
                 _container->setAttributeValue(Style::style,Style::Border::border("1px solid gray")+
                                               Style::background::color::color(Style::color::Grey::Gainsboro));
+//                auto btn = _layout->addWidget(cpp14::make_unique<WPushButton>("Haberler Anasayfa"),0,AlignmentFlag::Center);
+
+//                btn->clicked().connect([=](){
+//                    this->initPage();
+//                });
+
             }
 
 
@@ -7329,6 +7356,7 @@ Body::BilgiEdin::BilgiEdin::BilgiEdin(mongocxx::database *_db)
     :WContainerWidget(),
       db(_db)
 {
+    setAttributeValue(Style::style,Style::background::color::color(Style::color::White::Snow));
     mMainContainer = addWidget(cpp14::make_unique<WContainerWidget>());
     mMainContainer->addStyleClass(Bootstrap::Grid::container_fluid);
 //    mMainContainer->setMaximumSize(1250,WLength::Auto);

diff --git a/SerikBelediyesiWebSayfasi/src/footer.cpp b/SerikBelediyesiWebSayfasi/src/footer.cpp
@@ -95,3 +95,23 @@ void Footer::Footer::showMessage(std::string title, std::string msg)
 
     messageBox->show();
 }
+
+double Footer::Footer::getWidth() const
+{
+    return _width;
+}
+
+void Footer::Footer::setwidth(double width)
+{
+    _width = width;
+}
+
+double Footer::Footer::getHeight() const
+{
+    return _height;
+}
+
+void Footer::Footer::setheight(double height)
+{
+    _height = height;
+}
diff --git a/SerikBelediyesiWebSayfasi/src/footer.h b/SerikBelediyesiWebSayfasi/src/footer.h
@@ -38,6 +38,17 @@ namespace Footer {
 
         void showMessage( std::string title , std::string msg );
 
+
+        double getWidth() const;
+        void setwidth(double width);
+
+        double getHeight() const;
+        void setheight(double height);
+
+    private:
+        double _width;
+        double _height;
+
     };
 
 }

diff --git a/SerikBelediyesiWebSayfasi/src/giriswidget.cpp b/SerikBelediyesiWebSayfasi/src/giriswidget.cpp
@@ -12,6 +12,7 @@ Giris::GirisWidget::GirisWidget(mongocxx::database *_db)
       User(document{}.view())
 {
 
+    setAttributeValue(Style::style,Style::background::color::color(Style::color::White::Snow));
     setPadding(0,AllSides);
     mMainContainer = addWidget(cpp14::make_unique<WContainerWidget>());
     mMainContainer->addStyleClass(Bootstrap::Grid::container_fluid);

diff --git a/SerikBelediyesiWebSayfasi/srcV2/baskanwidget.cpp b/SerikBelediyesiWebSayfasi/srcV2/baskanwidget.cpp
@@ -1,6 +1,72 @@
 #include "baskanwidget.h"
 
-BaskanWidget::BaskanWidget()
+BaskanWidget::BaskanWidget(mongocxx::database *_db)
+    :DataBaseWidget (_db)
 {
 
+    setPadding(90,Side::Top);
+    setWidth(WLength("100%"));
+
+    auto mContainer = addWidget(cpp14::make_unique<WContainerWidget>());
+    mContainer->addStyleClass(Bootstrap::Grid::container_fluid);
+
+    auto rContainer = mContainer->addWidget(cpp14::make_unique<WContainerWidget>());
+    rContainer->addStyleClass(Bootstrap::Grid::row);
+    rContainer->setMaximumSize(1024,WLength::Auto);
+
+
+    //FOTO
+    {
+        auto fotoWidget = rContainer->addWidget(cpp14::make_unique<WContainerWidget>());
+        fotoWidget->addStyleClass(Bootstrap::Grid::col_full_12);
+        fotoWidget->setHeight(350);
+        fotoWidget->setAttributeValue(Style::style,Style::background::url("v2/baskan/baskan1.png")
+                                      +Style::background::size::contain
+                                      +Style::background::repeat::norepeat
+                                      +Style::background::position::center_center);
+
+
+
+
+    }
+
+
+    // TEXT
+    {
+        auto textWidget = rContainer->addWidget(cpp14::make_unique<WContainerWidget>());
+        textWidget->addStyleClass(Bootstrap::Grid::col_full_12);
+        textWidget->setAttributeValue(Style::style,Style::background::color::color(Style::color::White::Snow));
+
+        auto filter = document{};
+
+        try {
+            filter.append(kvp("type","Başkan"));
+        } catch (bsoncxx::exception &e) {
+
+        }
+
+        try {
+            filter.append(kvp("baskan","Enver APUTKAN"));
+        } catch (bsoncxx::exception &e) {
+
+        }
+
+
+        try {
+            auto val = this->collection("Yonetim").find_one(filter.view());
+
+            if( !val.value().view().empty() )
+            {
+                auto str = val.value().view()["html"].get_utf8().value.to_string();
+                auto text = textWidget->addWidget(cpp14::make_unique<WText>(str,TextFormat::UnsafeXHTML));
+            }
+
+        } catch (mongocxx::exception &e) {
+
+        }
+
+
+    }
+
+
 }
diff --git a/SerikBelediyesiWebSayfasi/srcV2/baskanwidget.h b/SerikBelediyesiWebSayfasi/srcV2/baskanwidget.h
@@ -1,11 +1,13 @@
 #ifndef BASKANWIDGET_H
 #define BASKANWIDGET_H
 
+#include "SerikBelediyesiWebSayfasi/BaseClass/databasewidget.h"
+
 
 class BaskanWidget : public DataBaseWidget
 {
 public:
-    BaskanWidget();
+    BaskanWidget(mongocxx::database* _db);
 };
 
-#endif // BASKANWIDGET_H
+#endif // BASKANWIDGET_H
diff --git a/SerikBelediyesiWebSayfasi/srcV2/headerpage.cpp b/SerikBelediyesiWebSayfasi/srcV2/headerpage.cpp
@@ -150,7 +150,21 @@ HeaderPage::HeaderPage(mongocxx::database *_db)
             {
                 auto _container = rContainer->addWidget(cpp14::make_unique<WContainerWidget>());
                 _container->setHeight(65);
-                _container->addStyleClass(Bootstrap::Grid::Offset::Large::col_lg_9+Bootstrap::Grid::Offset::Medium::col_md_9);
+                _container->addStyleClass(Bootstrap::Grid::Offset::Large::col_lg_8+Bootstrap::Grid::Offset::Medium::col_md_8+Bootstrap::Grid::Offset::Small::col_sm_10+Bootstrap::Grid::Offset::ExtraSmall::col_xs_9);
+                _container->addStyleClass(Bootstrap::Grid::Large::col_lg_1+Bootstrap::Grid::Medium::col_md_1+Bootstrap::Grid::Small::col_sm_2+Bootstrap::Grid::ExtraSmall::col_xs_3);
+                auto layout = _container->setLayout(cpp14::make_unique<WVBoxLayout>());
+                auto text = layout->addWidget(cpp14::make_unique<WText>("Başkan"),0,AlignmentFlag::Center|AlignmentFlag::Middle);
+                text->setAttributeValue(Style::style,Style::color::color(Style::color::White::Snow)+Style::font::size::s14px);
+                _container->clicked().connect([=](){
+                   _baskan.emit(NoClass());
+                });
+                text->decorationStyle().setCursor(Cursor::PointingHand);
+            }
+
+            {
+                auto _container = rContainer->addWidget(cpp14::make_unique<WContainerWidget>());
+                _container->setHeight(65);
+//                _container->addStyleClass(Bootstrap::Grid::Offset::Large::col_lg_9+Bootstrap::Grid::Offset::Medium::col_md_9);
                 _container->addStyleClass(Bootstrap::Grid::Large::col_lg_1+Bootstrap::Grid::Medium::col_md_1+Bootstrap::Grid::Hidden::hidden_sm+Bootstrap::Grid::Hidden::hidden_xs);
                 auto layout = _container->setLayout(cpp14::make_unique<WVBoxLayout>());
                 auto text = layout->addWidget(cpp14::make_unique<WText>("İletişim"),0,AlignmentFlag::Center|AlignmentFlag::Middle);
@@ -245,3 +259,8 @@ Signal<NoClass> &HeaderPage::ClickIletisim()
 {
     return _Iletisim;
 }
+
+Signal<NoClass> &HeaderPage::ClickBaskan()
+{
+    return _baskan;
+}
diff --git a/SerikBelediyesiWebSayfasi/srcV2/headerpage.h b/SerikBelediyesiWebSayfasi/srcV2/headerpage.h
@@ -30,6 +30,8 @@ class HeaderPage : public DataBaseWidget
 
     Signal<NoClass> &ClickIletisim();
 
+    Signal<NoClass> &ClickBaskan();
+
 private:
     Signal<NoClass> _Anasayfa;
 
@@ -50,6 +52,9 @@ class HeaderPage : public DataBaseWidget
     Signal<NoClass> _Hakkinda;
 
     Signal<NoClass> _Iletisim;
+
+    Signal<NoClass> _baskan;
+
 };
 
 #endif // HEADERPAGE_H