aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* * merged commits from 'maxwell lou' by time '20131028_09:52';HEADmasterAlvin Li2013-10-30120-4051/+3229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * moved 'ValueKind' model from 'recommend/models' to 'indicator/models' * added field 'type' for 'indicator.models.Indicator' * added field 'kind' for 'indicator.models.IndicatorRecord', 'InnateConfine' * updated methods for models 'Indicator', 'IndicatorRecord', 'InnateConfine' * updated views and templates for 'apps/indicator' * added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py' * added 'type' field for 'indicator.models.Indicator' in 'search_indexes.py' * added a confirm step for 'EditHistoryData' page when delete a record * removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir * moved *.json to 'backup' dir * removed 'apps/managers*.py' * updated 'indicator/popup/IndexDesc.html' * created dir 'apps/indicator/obsolete'; * moved 'indicator/forms.py' to dir 'obsolete'; * splitted views related forms.py from 'views.py', and placed in 'obsolete/views_forms.py' * loadded newest data into database * cleaned pervious data files in 'backup' dir * updated 'README.txt'; added a solution to a redis problem * added field 'type' of 'indicator.models.Indicator'; for filtering search results and only returning 'NORMAL_TYPE'
* * treat 'apps/utils' as regular django app; which used to storeAlvin Li2013-10-09890-65/+3375
| | | | | | | | | | | | | | | | | | | | | | | | | | general tools for used in other apps * moved 'templatetags' from 'apps/indicator' to 'apps/utils' * '.gitignore' to ignore 'fixtures_bak' * moved js plugins from 'apps/indicator/static/plugins' to 'staticfiles/plugins' apps/recommend: * updated 'recommend.models'; o commented 'recommend.models.ResearchCombination' (not used) * implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs'; * added pages 'templates/recommend/add_edit_blog_info.html', 'add_edit_blog_info_error.html'; o related css and javascripts files * added 'tools.py'; * added 'utils/tools.py' for placing generic functions; * deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak'); * small fixes to 'indicator.models', 'sciblog.models' and 'sfaccount.views' * fixed automatically show 'proper_nouns' annotation in blog: recovered the line 'import signals' in 'sciblog.models' * added 'is_ok()' method for 'recommend.models.ResearchConfig';
* * added settings 'ASYNC_SEND_MAIL'Alvin Li2013-10-0615-37/+234
| | | | | | | * added parameter 'async' to 'Account.send_activation_email()' method * improved views 'sfaccount.views.activate_view' * adjusted urls 'activate_key' * added view 'sfaccount.views.activate_done_view'
* * improved 'signup' function for sfaccountAlvin Li2013-10-057-16/+42
| | | | | | * changed 'redirect url' for 'sfaccount.views.signup_view' * improved 'sfaccount.models.Account', added 'delete_account()' method; added 'html' type email templates for activation email
* * indicator/static/javascripts/card_chart.js:Alvin Li2013-10-0457-140/+1435
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved the display position of 'detail_card_info' * indicator/templates/indicator/SheetDefault.html: destroy 'qtip' when close card * added new app 'apps/sfaccount' * implemented 'signup' and 'activate' functions * implemented async sending activation mail (using 'django-celery' and 'redis') * moved 'registration/*' templates to 'sfaccount/templates' * implemented 'password_change' function: o password_change o password_change_done * implemented 'password_reset' function o password_reset o password_reset_done o password_reset_confirm o password_reset_complete o re-write 'sfaccount.fomrs.SFPasswordResetForm' o re-write 'sfaccount.views.password_reset_view' * improved 'sfaccount.functional' send mail functions o to send 'multipart' mail * added 'README.txt' * added app 'apps/recommend': for comparing with the SCI papers and then recommending most related papers for user.
* auto redraw chart when:Alvin Li2013-09-2211-166/+309
| | | | | | | | | | | | | | * added new record * modified record data/date * deleted record EditHistoryData page: * added 'delete button' (#delete_btn) * added 'indicator.views.ajax_delete_record()' * updated css style for delete button * updated css style for record 'state' * added check for 'unit' when save 'IndicatorRecord'
* *** merged changes of front pages ***Alvin Li2013-09-2046-5974/+7846
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merged changes from '97suifang-front' by mjymjydark; and modified to work with django * finished 'editing_data' div of 'SheetDefault' for add new record * added 'indicator.views.ajax_add_record()' *** search *** * improved 'search' function of 'NewDeleteIndex' page; employ AJAX to load search results; * added 'indicator.views.search_indicators()' *** recommend indicator *** * improved the functions of 'recommend_indicator' * added 'sciblog.models.UserCollection' to record the collection information for each user * improved 'sciblog.views.add_user_to_m2m()' to work with 'UserCollection' * added field 'lastRecommendTime' in 'indicator.models.UserIndicator' * updated 'indicator.views.indicator_status' against 'recommend_indicator' *** qtip2 for recommended indicator *** * added 'qtip2' tooltip for recommended indicator card * added '97suifang' qtip css (qtip-sf) * added tooltip for 'add record' when return error (SheetDefault page); * improved the style of 'collection_btn' and 'go_library_btn' of IndexDesc page;
* * finished modifying 'PM_TYPE' record for 'EditHistoryData' pageAlvin Li2013-09-0926-118/+588
| | | | | | | * synced '97suifang-front' TODO: * to merge changes of '97suifang-front'
* * added plugin 'qtip2' to provide 'tooltips';Alvin Li2013-08-2714-113/+4622
| | | | | | | | | | employed in adding/modifying record data to provide validation info; * added 'ajax_modify_record' url; removed 'ajax_edit_history_data' url; * added 'indicator.views.ajax_modify_record()' for 'EditHistoryData.html'; * renamed 'indicator.views.add_recordhistory()' to 'add_recordhistory_view()'; * added 'indicator.tools.add_recordhistory()'; * added 'pytz' to 'env/requirements.pip'; 'pytz' to handle timezone in python & django (recommended)
* * improved the popup page 'EditHistoryData.html':Alvin Li2013-08-2511-165/+10228
| | | | | | | | | | | | | | | | | | | | | | o improvd page styles; o updated related view: 'indicator.views.indicator_edithistorydata()'; o updated related css styles; o added styles 'valid' and 'invalid'; o added 'jquery-ui: datepicker' to select date; o added 'reason_input' field to get the reason for modification; o implemented validation for 'date' and 'reason' field; * added testing record data for testing 'detail_card'; * added 'cursor: pointer' for 'ui-datepicker-trigger'; * small style change to the 'see_more_button' of SheetDefault.html; * added umcompressed 'jquery-1.9.1.js' for backup; * added param 'type' for 'indicator.tools.format_data()'; TODO: EditHistoryData.html: o to show original record data properly; o to add validation for data field o to implement ajax POST data and related view
* * added latest full package of 'jquery-ui' plugin, v1.10.3;Alvin Li2013-08-22793-304/+227254
| | | | | | | | | | | | | | | | | | | | | | | | | | * improved 'thickbox' plugin to use 'jquery-1.9.x'; * upgraded 'SheetDefault.html', 'NewDeleteIndex.html' and other pages to use 'jquery-1.9.x'; * improved 'IndexDesc.html' to deal with the problem of no related annotation found; * 'indicator.tools.get_record()' added param 'number', and updated the format of return data; * added 'get_num_record()' and 'get_num_record_std()' to 'indicator.tools'; * improved 'indicator.views.ajax_get_card_data_chart()', now can get data by 'num' or by 'date'; * improved 'indicator.views.ajax_get_card_data_table()', to provide the needed data requested from 'detail_card'; * improved js function 'chart_getdata_draw()' in 'SheetDefault.html'; * 'card_chart.js': renamed 'redraw_chart()' to 'detail_chart_getdata_draw()', and updated to get data by type; * updated 'table' of 'detail_card' in 'SheetDefault.html'; * improved js function 'get_card_data_table()' for providing and displaying record data in 'detail_card' table. TODO: * add/delete/edit record data
* med 'indicator/static/javascripts/load_card.js' to 'card_chart.jsAlvin Li2013-08-2178-6112/+12418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * set Highcharts global options in 'card_chart.js' * 'indicator/templates/indicator/SheetDefault.html': added js function 'chart_getdata_draw()' to draw chart for card * improved 'indicator.views.ajax_get_card_data_chart()' * implemented drawing chart for 'FLOAT_TYPE' and 'RANGE_TYPE' indicators * added datetime plugin 'momentjs': 'indicator/static/plugins/moment/', version 2.1.0 * 'indicator/templates/indicator/NewDeleteIndex.html': added link button to goto 'indicator_status' SheetDefault.html page * added option 'useHTML: true' for Highcharts; improved the display style of ylabels, if value >9999, then show in exponential notation * improved drawing of 'detail_chart', and the 'detail_card_info' * moved js global var to 'SheetDefault.html'; renamed var 'card_detail_id' to 'detail_card_id' * fixed js local variables problem; added 'var' keyword * added check of 'date' for 'indicator.models.IndicatorRecord' * ThickBox: removed param 'no1_title' from thickbox popup page's url placed the param 'card_id' before 'TB_iframe' * changed to use 'ANNOTATION_TYPES' for 'sciblog.models.BlogAnnotation' * improved 'indicator/templates/indicator/popup/IndexDesc.html' improved 'indicator.views.indicator_indexdesc()' * added 'sympy' to 'env/requirements.pip' TODO: * BlogAnnotation: 'get_absolute_url()' -> 'IndexDesc: go_library_btn' * detail_card_info: data table * Data input/edit form, and validate & submit * Highcharts xAxis labels problem ??
* * improved 'indicator.views.follow_indicator()',Alvin Li2013-08-1823-565/+1087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed to 'indicator_fanduf()' due to name conflict * finished 'search' function for page indicator NewDeleteIndex.html * added 'apps/utils/search_tools.py': some tools to process search results * renamed 'sciblog/templatetags/tools.py' to 'get_range.py' * added 'format_data()' to indicator.tools': to format data of record/confine, make it properly display in html page; * 'indicator/javascripts/new_delete_index.js': added global 'var added_indexes_id' to track the already added indexes * added 'indicator/templatetags/divisible_by.py' filter to check if a number can be extactly divide by another number; * fixed the 'index_card_fir/index_card_sec' problem of 'act_card_container' of page 'SheetDefault.html' * indicator/static/css/new_delete_index.css: added 'index_search_error' and 'index_error' * fixed 'unit.dump' problems in 'indicator.models' * 'indicator.tools': o added 'RI_TYPES', 'RI_WEIGHTS' o added 'type' in the return value of 'calc_indicator_weight()' and 'recommend_indicator()' * added field 'followedHistories' in 'indicator.models.UserIndicator' * moved 'follow_indicator()' and 'unfollow_indicator()' from 'indicator.views' to 'indicator.tools' TODO: * highcharts: draw chart for indicator records; * add/edit data, and submit (page format design) * followed indicator submit buttion
* * updated 'indicator/templates/indicator/NewDeleteIndex.html':Alvin Li2013-08-164-290/+111
| | | | | | | o page_condition: "all", "category", "search" o make use of django templates to generate contents * updated 'indicator.views': GET, POST methods for NewDeleteIndex page * indicator.search_indexes: changed 'categories' to 'categories_id'
* solr/conf/schema.xml: changed 'categories' to 'categories_id'Alvin Li2013-08-161-1/+1
|
* * updated 'indicator.views' for front pagesAlvin Li2013-08-159-437/+681
| | | | | | * use 'render' instead of 'render_to_response' * updated 'indicator/templates/indicator/NewDeleteIndex.html' to show all indicators and followed indicators
* * updated 'apps/indicator/templates/indicator/' pages,Alvin Li2013-08-1524-470/+680
| | | | | | | | | | extends "base.html", make use of the django template system * added 'static_url', 'indicator_url' js variables * implemented the AJAX function for 'apps/indicator/templates/' pages TODO: * finish 'indicator.views': get_card_data_chart(), get_card_data_table() * link the front pages with the django models, forms and search!
* updated git index (previously deleted files)Alvin Li2013-08-147-170/+0
|
* * added 'templates/search/search.html'Alvin Li2013-08-1480-26/+10048
| | | | | | | | | | | | * updated haystack settings * updated 'static' files settings * added 'search function' for 'apps/indicator': IndicatorCategory, Indicator * merged static files of '97suifang-front' by 'mjymjydark' * merged pages of '97suifang-front' by 'mjymjydark' * updated pages to use 'django templates syntax' for the static links TODO: to fix the 'static links' of 'indicator/static/javascripts/*.js'
* added '97suifang-front'Alvin Li2013-08-1366-0/+9711
|
* added 'isuifang_solr'Alvin Li2013-08-13267-0/+31661
|
* cloned from 'bitbucket', 2013/08/13Alvin Li2013-08-13471-0/+53129
|
* Initial commitAlvin Li2013-08-122-0/+27