- -
- -
  • -
    - -
    -
    - -
    - -
    -
    -
    • - -
  • -
    - -
    -
    - -
    - -
    -
    -
    • - -
  • -
    - -
    -
    - -
    - -
    -
    -
    • -
    - -
    -
    -
    - - - -
    -

    {{ category.Name }}

    - {{ category.Qtd }} + +
    +
    + +
    + + +
    +

    Palavras mais pesquisadas

    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +

    + Order por: + Mais Recente + Mais Antigo +

    +
    +
    + + +
    +
    - - -
    - - -
    -
    - -
    - -
    -

    Palavras mais pesquisadas

    -
    -
    -
    - - -
    -
    -
    -
    -

    - Order por: - Mais Recente - Mais Antigo -

    -
    -
    - - +
      +
    • +
      + + + +
      +
      +

      {{ searchDocument.Assunto}}

      +
      + {{ searchDocument.EntidadeOrganicaNome }} + {{ formateIsoDate(searchDocument.Data) }} +
      +
      +
      • +
    +
    +
    -
      -
    • -
      - - - -
      -
      -

      {{ searchDocument.Assunto}}

      -
      - {{ searchDocument.EntidadeOrganicaNome }} - {{ formateIsoDate(searchDocument.Data) }} -
      -
      -
      • -
    +
    -
    + \ No newline at end of file diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index fa5ec326e..d5ef5aded 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -47,12 +47,8 @@ ion-slide{ .options{ margin-top: 10px; .container{ - display: flex; .d-flex{ - display: flex; - flex-wrap: wrap; width: 100%; - flex-wrap: wrap; .button{ min-width: 116px; border: solid 1px #e9e9e9; @@ -114,140 +110,97 @@ ion-slide{ display: flex; } -// document -.word-searh-result-container{ - display: flex; - flex-wrap: wrap; - // search result - .search-result{ - width: 100%; - border-bottom: unset; - padding: 0px 20px; - .header{ +// search result +.search-result{ + width: 100%; + border-bottom: unset; + padding: 0px 20px; + + .header{ + /* border-top: 1px solid #ebebeb; */ + .sort-by{ + width: 100%; + .order{ + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color:#797979 + } + .order-labal{ + font-family: Roboto; + font-size: 15px; + color: #0d89d1; + margin-left: 20px; + } + } + ion-icon{ + font-size: 25px; + } + } + ul{ + padding: 0px; + margin: 0px; + li{ + padding-top: 8px; + padding-bottom: 8px; border-top: 1px solid #ebebeb; - .sort-by{ + display: flex; + align-items: center; + .icon{ + font-size: 35px; + align-items: center; + display: flex; + } + .content{ width: 100%; - .order{ - font-family: Roboto; - font-size: 13px; - font-weight: 300; - color:#797979 - } - .order-labal{ + margin-left: 10px; + p{ + margin: 0px; + width: 100%; font-family: Roboto; font-size: 15px; color: #0d89d1; - margin-left: 20px; + line-height: 1.67; } - } - ion-icon{ - font-size: 25px; - } - } - ul{ - padding: 0px; - margin: 0px; - li{ - padding-top: 8px; - padding-bottom: 8px; - border-top: 1px solid #ebebeb; - display: flex; - align-items: center; - .icon{ - font-size: 35px; - align-items: center; - display: flex; + span{ + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color: #797979; } - .content{ - width: 100%; - margin-left: 10px; - p{ - margin: 0px; - width: 100%; - font-family: Roboto; - font-size: 15px; - color: #0d89d1; - line-height: 1.67; - } - span{ - font-family: Roboto; - font-size: 13px; - font-weight: 300; - color: #797979; - } - span.documente-date{ + span.documente-date{ - } - span.organic-entity{ - width: 100%; - } + } + span.organic-entity{ + width: 100%; } } } } - // most searched word - .most-searched-words{ +} +// most searched word +.most-searched-words{ + width: 100% !important; + //min-width: 441px; + p.title{ width: 100%; - p.title{ - width: 100%; - height: 24px; - font-family: Roboto; - font-size: 20px; - text-align: center; - color: black; - } + height: 24px; + font-family: Roboto; + font-size: 20px; + text-align: center; + color: black; + } - .most-searched-word-container{ - height: 400px; - } + .most-searched-word-container{ + height: 400px; } } - @media only screen and (min-width: 1024px) { - - .header-main { - background-color: #0782c9; - .profile{ - display: inline-block; - } - .icon-most-searched-word-open{ - display: none !important; - } - } - - .options{ - .container{ - border-bottom: 1px solid #ebebeb; - .icon{ - display: flex; - } - } - padding: 0px 20px; - } - - - - .search-result{ - border-left: 1px solid #d8d8d8; - .header{ - border-top: unset !important; - } - } - - .most-searched-words{ - width: 400px !important; - } - - .word-searh-result-container{ - flex-wrap: wrap; - } - - } diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 09991ba83..614c3f426 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -34,12 +34,9 @@ export class SearchPage implements OnInit { showLoader: boolean; - height: number = 411; - width: number = 411; - // See http://idangero.us/swiper/api/ for valid options. slideOpts = { - slidesPerView: 3, + slidesPerView: parseInt(`${window.innerWidth/147}`, 10), initialSlide: 0, speed: 400, } @@ -48,6 +45,8 @@ export class SearchPage implements OnInit { list = [] + windowWidth: number; + constructor(private modalController: ModalController, private search: SearchService, private modalCtrl: ModalController,) { @@ -56,16 +55,24 @@ export class SearchPage implements OnInit { ngOnInit() { - this.wordCloud() + this.wordCloud(); + + window.onresize = (event) => { + this.windowWidth = window.innerWidth + this.loadWordCloud() + }; + + this.windowWidth = window.innerWidth + } wordCloud(){ this.search.mostSeachWord("15").subscribe(res=>{ - const container = document.querySelector('.most-searched-word-container'); + const container = document.querySelector('.seach-wrapper'); - container.setAttribute('style',`width: ${window.innerWidth}px`); + // container.setAttribute('style',`width: ${window.innerWidth}px`); const highest= res[0].Hits; const lowest = res[res.length-1].Hits; @@ -90,6 +97,26 @@ export class SearchPage implements OnInit { const elem = document.documentElement.querySelector('.most-searched-word-container'); + setTimeout(()=>{ + WordCloud( + elem, + { + list: this.list, + Family: 'Times, serif', + gridSize: 15 + }, + ); + },300) + + }); + } + + + loadWordCloud(){ + + setTimeout(()=>{ + const elem = document.documentElement.querySelector('.most-searched-word-container'); + WordCloud( elem, { @@ -99,7 +126,8 @@ export class SearchPage implements OnInit { }, ); - }); + },100); + } close(){ @@ -124,13 +152,11 @@ export class SearchPage implements OnInit { }); } - /** * @description Basic search */ basicSearch(){ - if(window.location.pathname == '/home/agenda'){ @@ -159,10 +185,11 @@ export class SearchPage implements OnInit { } this.showLoader = false; + this.loadWordCloud(); + }); } else if (window.location.pathname =='/home/gabinete-digital'){ - this.showLoader = true; this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender @@ -186,7 +213,8 @@ export class SearchPage implements OnInit { } else { this.showDocuments = false } - + + this.loadWordCloud(); }); this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender @@ -212,6 +240,7 @@ export class SearchPage implements OnInit { } this.showLoader = false; + this.loadWordCloud(); }); } else if (window.location.pathname == '/home/publications'){ @@ -240,9 +269,9 @@ export class SearchPage implements OnInit { } this.showLoader = false; + this.loadWordCloud(); }); } - } @@ -270,7 +299,6 @@ export class SearchPage implements OnInit { return formatDate(date, 'dd/MM/yyyy', 'pt'); } - activeCategoty(i){ this.searchCategories.forEach((e, j) => { @@ -284,7 +312,6 @@ export class SearchPage implements OnInit { } else { this.searchCategories[i]['Active'] = true } - } clearInputRemetente(){ @@ -405,6 +432,3 @@ export class SearchPage implements OnInit { } } - - - diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index 25bf81aa3..a293c6218 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -203,7 +203,7 @@
    - + diff --git a/src/style/main.scss b/src/style/main.scss index 6bbe20225..3fff5e25a 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -237,4 +237,21 @@ .text-center { text-align: center; +} + +.width-100{ + width: 100%; +} + +.height-100{ + height: 100%; +} + +.width-50{ + width: 50%; +} + + +.flex-1{ + flex: 1; } \ No newline at end of file